diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 19:07:22 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:07:22 +0100 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /scripts/patch-kernel | |
| parent | Merge branch 'pxa-trizeps' into pxa-machines (diff) | |
| parent | [ARM] 5248/1: wm97xx generic battery driver (diff) | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions