diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-18 23:46:36 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-18 23:46:36 -0700 |
| commit | 48a5765e5104f1afd22c75c5030af3a6cf24b4c3 (patch) | |
| tree | ec2668d208146182d5ec6f5eba5d1a7266e10715 /drivers/usb/serial/option.c | |
| parent | 0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb (diff) | |
| parent | b2596c682814b39f0dd16e19e3be8fc8581643bd (diff) | |
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
Diffstat (limited to 'drivers/usb/serial/option.c')
0 files changed, 0 insertions, 0 deletions