summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds2008-07-03 04:22:54 +0200
committerLinus Torvalds2008-07-03 04:22:54 +0200
commita16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 (patch)
tree870f95ae22f423e60f4518fd38ab8e0649769991 /arch
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentide: fix /proc/ide/ide?/mate reporting (diff)
downloadkernel-qcow2-linux-a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64.tar.gz
kernel-qcow2-linux-a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64.tar.xz
kernel-qcow2-linux-a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: fix /proc/ide/ide?/mate reporting Revert "BAST: Remove old IDE driver"
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions