diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 20:08:35 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 20:08:35 +0200 |
| commit | af7c951d76708c61b862463d579d76be757130bf (patch) | |
| tree | d047521fb2f8eafe92349ba4d6a66d6234886c87 /arch/x86 | |
| parent | Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm (diff) | |
| parent | [ARM] eseries: move UDC defs to machine files (diff) | |
| download | linux-af7c951d76708c61b862463d579d76be757130bf.tar.xz linux-af7c951d76708c61b862463d579d76be757130bf.zip | |
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
Merge branch 'pxa-eseries' into pxa-machines
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions