Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
	drivers/usb/gadget/composite.c

Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1

diff --cc arch/arm/mm/fault-armv.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc kernel/power/suspend.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/bluetooth/l2cap.c
Simple merge

diff --cc net/socket.c
Simple merge