android_kernel_motorola_sm6225/fs/9p
David Howells 9db7372445 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>
2006-12-05 17:01:28 +00:00
..
9p.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
conv.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
conv.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
debug.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
error.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
error.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
fcall.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
fcprint.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
fid.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
fid.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
Makefile [PATCH] 9p: fix name consistency problems 2006-03-25 08:22:54 -08:00
mux.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mux.h [PATCH] v9fs: signal handling fixes 2006-05-15 11:20:56 -07:00
trans_fd.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
transport.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
v9fs.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
v9fs.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
v9fs_vfs.h [PATCH] mark address_space_operations const 2006-06-28 14:59:04 -07:00
vfs_addr.c v9fs: do not include linux/version.h 2006-06-30 18:50:03 +02:00
vfs_dentry.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
vfs_dir.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
vfs_file.c [PATCH] severing fs.h, radix-tree.h -> sched.h 2006-12-04 02:00:24 -05:00
vfs_inode.c [PATCH] r/o bind mount prepwork: inc_nlink() helper 2006-10-01 00:39:30 -07:00
vfs_super.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00