diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 22:33:01 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 22:33:01 +0100 |
| commit | f18ea8276bc6b0f8584c442905e9badc2acc8785 (patch) | |
| tree | f71e3f05420f35f7eaf838d93fb83d665aedcac4 /drivers/ide/ide-pio-blacklist.c | |
| parent | ARM: Merge next-s3c24xx-simtec (diff) | |
| parent | ARM: H1940: Convert h1940 bluetooth driver to rfkill (diff) | |
| download | linux-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.xz linux-f18ea8276bc6b0f8584c442905e9badc2acc8785.zip | |
ARM: Merge next-s3c24xx-dev-rtp
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk
Conflicts:
arch/arm/mach-s3c2440/mach-anubis.c
Diffstat (limited to 'drivers/ide/ide-pio-blacklist.c')
0 files changed, 0 insertions, 0 deletions