Merge branch 'master' of lpclinux.com:linux-2.6.34-lpc32xx
authorKevin Wells <wellsk40@gmail.com>
Wed, 16 Feb 2011 01:04:23 +0000 (17:04 -0800)
committerKevin Wells <wellsk40@gmail.com>
Wed, 16 Feb 2011 01:04:23 +0000 (17:04 -0800)

Trivial merge