aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-proc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-10 09:26:38 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-10 09:26:38 +0100
commit467c88fee51e2ae862e9485245687da0730e29aa (patch)
tree244aa2469e31cb53d7e04ec0768b506ccad71932 /drivers/ide/ide-proc.c
parent1f442d70c84aa798e243e721eba728a98434cd86 (diff)
parent7ab152470e8416ef2a44c800fdc157e2192f2974 (diff)
parent8827247ffcc9e880cbe4705655065cf011265157 (diff)
parentd1a8e7792047f7dca7eb5759250e2c12800bf262 (diff)
parent0feca851c1b3cb4ebfa3149144b3d5de0879ebaa (diff)
parentd0fc63f7bd07cb779a06dc1cdd0c5a14e7f5d562 (diff)
parent7a203f3b089be4410fe065dd9927027eade94557 (diff)
parent3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff)
Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86/urgent', 'linus' and 'core/percpu' into x86/core