Merge branch 'linux-3.1.5' into android-tegra-nv-3.1
authorVarun Wadekar <vwadekar@nvidia.com>
Wed, 14 Dec 2011 10:03:34 +0000 (15:03 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 14 Dec 2011 10:03:34 +0000 (15:03 +0530)
commit638bc555a05c39ced59744c79c0461536782808d
tree42bf9c8cdfd44898be31bc31cf2e4743a2484cf4
parentf05a661e2247076a0c0e5a09ee8c4397b0de855e
parentcaf4b0430be8296bf644199bf3ed3056c02420c7
Merge branch 'linux-3.1.5' into android-tegra-nv-3.1

Conflicts:
arch/arm/Kconfig

Change-Id: If8aaaf3efcbbf6c9017b38efb6d76ef933f147fa
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
arch/arm/Kconfig
arch/arm/kernel/process.c
drivers/regulator/aat2870-regulator.c
drivers/usb/storage/unusual_devs.h
sound/soc/codecs/wm8753.c