From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 6 Mar 2012 16:12:13 +0000 (+0000)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b60805502fecc5ce05dad68fd242c4f3a1d1f1b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

6b60805502fecc5ce05dad68fd242c4f3a1d1f1b