diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-01 09:21:09 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-01 09:21:09 -0500 |
commit | 2cfec93fecc086c5af3c58ad15b7841f36af205c (patch) | |
tree | ac49a9397442c10e3c9106357bf2c9d8bccb9e46 /arch | |
parent | f9eabc3deedccf545bd73fd72b3af2759d44f6f3 (diff) | |
parent | f019ee5feb344ff0b22b58df4568676295aae14f (diff) | |
parent | 47f5ae51f2aedac2f3006c1252f1020fdfc1d3c0 (diff) |
Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39