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)
commit48a5765e5104f1afd22c75c5030af3a6cf24b4c3
treeec2668d208146182d5ec6f5eba5d1a7266e10715
parent0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb
parentb2596c682814b39f0dd16e19e3be8fc8581643bd
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards

* 'board-specific' of git://github.com/hzhuang1/linux:
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/mioa701.c