summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Makefile
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-12-05 18:01:28 +0100
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>2006-12-05 18:01:28 +0100
commit9db73724453a9350e1c22dbe732d427e2939a5c9 (patch)
tree15e3ead6413ae97398a54292acc199bee0864d42 /drivers/scsi/Makefile
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
parent[PATCH] Centralise definitions of sector_t and blkcnt_t (diff)
downloadlinux-9db73724453a9350e1c22dbe732d427e2939a5c9.tar.xz
linux-9db73724453a9350e1c22dbe732d427e2939a5c9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/scsi/Makefile')
0 files changed, 0 insertions, 0 deletions