Merge branch 'master' of git://git.lpclinux.com/linux-2.6.34-lpc32xx
authorKevin Wells <wellsk40@gmail.com>
Thu, 7 Apr 2011 18:24:17 +0000 (11:24 -0700)
committerKevin Wells <wellsk40@gmail.com>
Thu, 7 Apr 2011 18:24:17 +0000 (11:24 -0700)

Trivial merge