Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 8 Jan 2011 22:47:29 +0000 (14:47 -0800)
committerColin Cross <ccross@android.com>
Sat, 8 Jan 2011 22:47:29 +0000 (14:47 -0800)
commitc07aee9df0e40fe9621db66ec00857228090e46c
tree4341741c051eec917955f652d889d6609492ef42
parent351516118103c6c7bb5321aa9d5866eb3dc0d5ca
parentdb23c5ae580ea8bba4bd10449c5571939aef8086
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile

Change-Id: I826244513f799fdd2fb0269abad3271c96661293
drivers/misc/Kconfig
drivers/misc/Makefile