summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-08 12:14:27 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-08 12:14:27 -0700
commitfe5a2de17e65d82b9d502da80ccb5a689d03fdd2 (patch)
tree546492b849c1113ac6889395c353ae577860c7fd /Makefile
parent1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c (diff)
parent4660897e6c2daa198fc8e3f47ae2a4aef69c80b0 (diff)
downloadlinux-3.10-fe5a2de17e65d82b9d502da80ccb5a689d03fdd2.tar.gz
linux-3.10-fe5a2de17e65d82b9d502da80ccb5a689d03fdd2.tar.bz2
linux-3.10-fe5a2de17e65d82b9d502da80ccb5a689d03fdd2.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: qd65xx: fix PIO mode selection sis5513: adding PCI-ID
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions