Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Tue, 22 Mar 2011 18:43:45 +0000 (11:43 -0700)
committerColin Cross <ccross@android.com>
Tue, 22 Mar 2011 18:43:45 +0000 (11:43 -0700)
commitdd58180b764dd92bddc952c0bdac39397f3ae4aa
tree091e5bf5f4ccda8b71af22dc2a26d3b990e8c430
parent3f3c5a9fc9e65823c8de0b7130b58cfec5918124
parent9b571241de8cfa131178e9120ad46f1756bad8a7
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
drivers/serial/tegra_hsuart.c

Change-Id: I535bef9c6645e5ec86f374a8f4d1fb3569274e53
drivers/serial/tegra_hsuart.c