Commit Graph

3241 Commits

Author SHA1 Message Date
Brian Behlendorf 045b40eaed Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:51 -08:00
Brian Behlendorf 93c62a7b5e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:48 -08:00
Brian Behlendorf 2724e266e7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-05 14:22:47 -08:00
Brian Behlendorf 74a47d6b78 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:44 -08:00
Brian Behlendorf 76d1fb3869 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-05 14:22:43 -08:00
Brian Behlendorf b5b475d435 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:40 -08:00
Brian Behlendorf 01489019d1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-05 14:22:39 -08:00
Brian Behlendorf 7d2a94f485 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-05 14:22:36 -08:00
Brian Behlendorf 0c8e9a41f9 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:36 -08:00
Brian Behlendorf 17d50d3b3e Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:33 -08:00
Brian Behlendorf 462df1c23e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-05 14:22:32 -08:00
Brian Behlendorf 499a3f86b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-05 14:22:31 -08:00
Brian Behlendorf 3ba5ab407c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-05 14:22:26 -08:00
Brian Behlendorf 5d63be0ebe Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:26 -08:00
Brian Behlendorf 3198db7a18 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-05 14:22:25 -08:00
Brian Behlendorf 7cb22fd044 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-05 14:22:19 -08:00
Brian Behlendorf b42d83e4d8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:19 -08:00
Brian Behlendorf aa73961771 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:16 -08:00
Brian Behlendorf 6cc0f22846 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-05 14:22:15 -08:00
Brian Behlendorf 2f4849c35d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:12 -08:00
Brian Behlendorf 8b248c7a6e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-05 14:22:11 -08:00
Brian Behlendorf b63863fa06 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:08 -08:00
Brian Behlendorf edd0a6552c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-05 14:22:07 -08:00
Brian Behlendorf fe730550e4 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-05 14:22:04 -08:00
Brian Behlendorf d87293e17d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:04 -08:00
Brian Behlendorf ca69ce2917 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-05 14:22:00 -08:00
Brian Behlendorf 01052b4724 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-05 14:22:00 -08:00
Brian Behlendorf 79689743c3 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-05 14:21:56 -08:00
Brian Behlendorf 7adfe1b8ba Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-05 14:21:55 -08:00
Brian Behlendorf 18266508c7 Change libport+libsolcompat references to libspl 2008-12-05 14:20:33 -08:00
Brian Behlendorf e26588e8bc Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-05 12:49:53 -08:00
Brian Behlendorf 6229b95b6e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 12:48:39 -08:00
Brian Behlendorf 51e57e41da Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-05 12:47:37 -08:00
Brian Behlendorf 0b8ab32645 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-05 12:46:41 -08:00
Brian Behlendorf 28194af7e6 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-05 12:45:46 -08:00
Brian Behlendorf d2032d798f Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 12:44:50 -08:00
Brian Behlendorf c495db8223 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-05 12:43:57 -08:00
Brian Behlendorf 3a8d93c102 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-05 12:43:10 -08:00
Brian Behlendorf 3896613543 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-05 12:42:26 -08:00
Brian Behlendorf fd79d4c796 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-05 12:41:42 -08:00
Brian Behlendorf 0408c2d6a1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-05 12:40:58 -08:00
Brian Behlendorf d6f7161332 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-05 12:40:22 -08:00
Brian Behlendorf b4056061b2 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-05 12:39:50 -08:00
Brian Behlendorf 3f0871ac8a Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-05 12:39:20 -08:00
Brian Behlendorf b33947124c Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-05 12:38:47 -08:00
Brian Behlendorf a363cdfb2d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-05 12:38:16 -08:00
Brian Behlendorf 75091e3f03 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-05 12:37:53 -08:00
Brian Behlendorf 3d398a481d Refresh linux-have-xdr 2008-12-05 12:32:24 -08:00
Brian Behlendorf 61a9bb6151 Refresh linux-have-uio-rw 2008-12-05 12:23:10 -08:00
Brian Behlendorf 766bd8d0e9 Refresh linux-debug-zerocopy 2008-12-05 12:20:18 -08:00