Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git...
commit2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2
authorOlof Johansson <olof@lixom.net>
Thu, 17 Mar 2011 06:08:22 +0000 (16 23:08 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 17 Mar 2011 06:08:22 +0000 (16 23:08 -0700)
tree16deb170fef81c11aff65d5beda92e45533ec96c
parent6f168f2fa60f87e85e0df25e87e2372f22f5eb7c
parentf02726a77960194995dac9fd218ec10b4de76cd6
Merge branch 'trimslice/upstream' of git://git./linux/kernel/git/rppt/linux-tegra into boards-for-next