Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 24 May 2011 22:41:54 +0000 (15:41 -0700)
committerErik Gilling <konkers@android.com>
Tue, 24 May 2011 22:42:09 +0000 (15:42 -0700)
Change-Id: I80fdbf17c2e3a77be3ea63350191c8eab235ed94


Trivial merge