From: Olof Johansson <olof@lixom.net>
Date: Sat, 19 May 2012 06:46:36 +0000 (-0700)
Subject: Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=48a5765e5104f1afd22c75c5030af3a6cf24b4c3;p=openwrt%2Fstaging%2Fblogic.git

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

48a5765e5104f1afd22c75c5030af3a6cf24b4c3