]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e6ce5f b2596c6)
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
authorOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 06:46:36 +0000 (23:46 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 06:46:36 +0000 (23:46 -0700)
* 'board-specific' of git://github.com/hzhuang1/linux:
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro

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

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