]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb7b99f36e1de1cbf7d1538979649778f59f3f461
tree15e3ead6413ae97398a54292acc199bee0864d42
parent33a8b6f804a3e7cad014e79e76f1d8e4aeaa917b
parentad49f4972bb55a37debe826481c7bca8b3de76d8
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>
15 files changed:
drivers/ata/libata-core.c
drivers/ata/libata-eh.c
drivers/ata/libata-scsi.c
drivers/ata/libata.h
drivers/macintosh/smu.c
drivers/media/dvb/cinergyT2/cinergyT2.c
drivers/net/spider_net.c
drivers/net/sungem.c
fs/ocfs2/alloc.c
fs/ocfs2/dlm/dlmdomain.c
fs/ocfs2/journal.c
fs/ocfs2/journal.h
fs/ocfs2/ocfs2.h
fs/ocfs2/super.c
include/linux/libata.h