Merge branch 'linux-3.1.y' into android-tegra-nv-3.1
authorVarun Wadekar <vwadekar@nvidia.com>
Mon, 16 Jan 2012 10:02:21 +0000 (15:02 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Mon, 16 Jan 2012 10:02:21 +0000 (15:02 +0530)
commit7919e929aa227048738e14df6bcbad3ee4458443
tree0c38267369fa636d7435bf22af39e3783a24ef62
parentfcbd75c6b179b717b074d0cb7490e42ae728fb2d
parent93dad393c796013cb6371be63d7af600c5e36c2c
Merge branch 'linux-3.1.y' into android-tegra-nv-3.1

Linux 3.1.9

Conflicts:
Makefile

Change-Id: I22227ab33ba7ddaba8e6fe049393c58a83d73648
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Makefile
drivers/usb/class/cdc-acm.c
drivers/usb/host/ehci-q.c
kernel/cgroup.c
kernel/cpu.c