Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:35:21 +0000 (15:35 -0800)
committerDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:35:21 +0000 (15:35 -0800)
commit760288c357c8cf1fc85f2e0d42f0ed117fb5d6fd
tree0874315d02755f8f4d057f19cb36339d32cd9221
parente55f37df8580864f23e69d641cae47daa791e889
parent8086994fdfc62889cfe70cc1d729cc0fe0166d2f
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/common/fiq_debugger.c

Change-Id: If8de163f3e1e41b35f87a5c8e9370f1cc28ed358