Merge remote-tracking branch 'bbelos/jellybean' into jellybean
this merge is support for 3.0 kernel
if you want 3.0 kernel, go to bbelos' repo
https://github.com/bbelos/android_kernel_samsung_aries