Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux-tegra into boards-for-next

This commit is contained in:
Olof Johansson 2011-03-16 23:08:22 -07:00
commit 2f40ea9d07
3 changed files with 31 additions and 0 deletions