]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a92e702 5616131)
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix build issue on stargate2
  ARM: pxa: fix build issue on cm-x300
  ARM: pxa: fix build failure for regulator consumer in em-x270.c
  ARM: pxa: fix regulator related build fail in magician_defconfig

1  2 
arch/arm/mach-pxa/cm-x300.c patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/hx4700.c patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/magician.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge
diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge
diff --cc arch/arm/mach-pxa/magician.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.