Commit Graph

5525 Commits

Author SHA1 Message Date
Brian Behlendorf 78366a832e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 16:56:07 -08:00
Brian Behlendorf 3a0fd3a92e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:56:05 -08:00
Brian Behlendorf 2e8b703fff Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:56:03 -08:00
Brian Behlendorf dea772ca21 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:52 -08:00
Brian Behlendorf 9c447385a9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 16:55:49 -08:00
Brian Behlendorf 293b3689f5 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:44 -08:00
Brian Behlendorf 960e9d0fc4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 16:55:42 -08:00
Brian Behlendorf 9258d70d0d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:36 -08:00
Brian Behlendorf 96e85b9e96 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 16:55:34 -08:00
Brian Behlendorf b7e8130ea0 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:28 -08:00
Brian Behlendorf 3b6915c368 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 16:55:25 -08:00
Brian Behlendorf 485b265eb7 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:19 -08:00
Brian Behlendorf 62153b0adc Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 16:55:15 -08:00
Brian Behlendorf 2eb1d87b20 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:10 -08:00
Brian Behlendorf e61cb00a7b Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 16:55:07 -08:00
Brian Behlendorf 4420db3d37 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:00 -08:00
Brian Behlendorf 6b0a49ea83 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 16:54:55 -08:00
Brian Behlendorf 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf fc183dc560 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 16:36:13 -08:00
Brian Behlendorf a89736c72e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 16:36:09 -08:00
Brian Behlendorf d318d2825a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:36:03 -08:00
Brian Behlendorf 252ef2053c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:36:02 -08:00
Brian Behlendorf b67aa16873 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:55 -08:00
Brian Behlendorf fc1b3ca740 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 16:35:53 -08:00
Brian Behlendorf 37d8e34028 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:46 -08:00
Brian Behlendorf 06d461ee7b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 16:35:43 -08:00
Brian Behlendorf bb3ff10d95 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:38 -08:00
Brian Behlendorf 29c4d604d3 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 16:35:36 -08:00
Brian Behlendorf 4c2f9bf240 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:30 -08:00
Brian Behlendorf 66be6018a5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 16:35:27 -08:00
Brian Behlendorf 27c5018851 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:21 -08:00
Brian Behlendorf dad4dd0dd4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 16:35:17 -08:00
Brian Behlendorf 7d64d7cf42 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:11 -08:00
Brian Behlendorf 15e778a05c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 16:35:07 -08:00
Brian Behlendorf 6a74a095d3 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:35:00 -08:00
Brian Behlendorf 8806156f06 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:34:57 -08:00
Brian Behlendorf 6d9700de51 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 16:34:51 -08:00
Brian Behlendorf 6fdfd55847 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:34:48 -08:00
Brian Behlendorf 2ce1bea950 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 16:34:41 -08:00
Brian Behlendorf 3f0c49cfa4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:34:38 -08:00
Brian Behlendorf d5ad22afd4 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 16:34:31 -08:00
Brian Behlendorf 07bc9c667e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 16:34:28 -08:00
Brian Behlendorf f7b6b1c5c1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 16:34:27 -08:00
Brian Behlendorf 9c2b7751c9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 16:34:16 -08:00
Brian Behlendorf f677f67130 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:34:12 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 2af9596270 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 16:33:58 -08:00
Brian Behlendorf 31f17baccc Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 16:33:55 -08:00
Brian Behlendorf 10a23c0f30 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 16:33:50 -08:00
Brian Behlendorf bf5dcc9261 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 16:33:47 -08:00