diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:40:42 +0200 |
| commit | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (patch) | |
| tree | 9246462da99ef4eb53c9c89a137d0a88c897f3d6 /drivers/ata/pata_sc1200.c | |
| parent | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (diff) | |
| parent | 234bb549eea16ec7d5207ba747fb8dbf489e64c1 (diff) | |
| download | talos-obmc-linux-5e62feabcc3e4127a084701ec54ffe891985b7e8.tar.gz talos-obmc-linux-5e62feabcc3e4127a084701ec54ffe891985b7e8.zip | |
Merge branch 'x86/cleanups' into irq/sparseirq
Reason: Avoid conflicts with removal of boot_cpu_id
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/ata/pata_sc1200.c')
0 files changed, 0 insertions, 0 deletions
