Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Mar 2012 16:12:13 +0000 (16:12 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Mar 2012 16:12:26 +0000 (16:12 +0000)
* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
  ARM: pxa: fix invalid mfp pin issue
  ARM: pxa: remove duplicated registeration on pxa-gpio
  ARM: pxa: add dummy clock for pxa25x and pxa27x

Includes an update to v3.3-rc6


Trivial merge