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)
commit6b60805502fecc5ce05dad68fd242c4f3a1d1f1b
treea53537e00ede0a31b8f9f91c1d79d1e1a6670797
parent4c75aab698d4b7cc08f3a5dd329fc7e9af3d0e3c
parentaf829310e8a914ad17ed61a7b18b14b4f457bca1
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* '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