projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c1ac1b e624386)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Howells <dhowells@redhat.com>
Tue, 5 Dec 2006 17:01:28 +0000 (17:01 +0000)
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>
Tue, 5 Dec 2006 17:01:28 +0000 (17:01 +0000)
commit9db73724453a9350e1c22dbe732d427e2939a5c9
tree15e3ead6413ae97398a54292acc199bee0864d42tree | snapshot
parent4c1ac1b49122b805adfa4efc620592f68dccf5dbcommit | diff
parente62438630ca37539c8cc1553710bbfaa3cf960a7commit | diff
Merge branch 'master' of git://git./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>
15 files changed:
drivers/ata/libata-core.c diff1 | diff2 | blob | history
drivers/ata/libata-eh.c diff1 | diff2 | blob | history
drivers/ata/libata-scsi.c diff1 | diff2 | blob | history
drivers/ata/libata.h diff1 | diff2 | blob | history
drivers/macintosh/smu.c diff1 | diff2 | blob | history
drivers/media/dvb/cinergyT2/cinergyT2.c diff1 | diff2 | blob | history
drivers/net/spider_net.c diff1 | diff2 | blob | history
drivers/net/sungem.c diff1 | diff2 | blob | history
fs/ocfs2/alloc.c diff1 | diff2 | blob | history
fs/ocfs2/dlm/dlmdomain.c diff1 | diff2 | blob | history
fs/ocfs2/journal.c diff1 | diff2 | blob | history
fs/ocfs2/journal.h diff1 | diff2 | blob | history
fs/ocfs2/ocfs2.h diff1 | diff2 | blob | history
fs/ocfs2/super.c diff1 | diff2 | blob | history
include/linux/libata.h diff1 | diff2 | blob | history
John Crispins staging tree