Commit Graph

7285 Commits

Author SHA1 Message Date
Brian Behlendorf a94bfe5a2d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 14:13:55 -08:00
Brian Behlendorf 743a2a757f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 14:13:54 -08:00
Brian Behlendorf e25fab9985 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 14:13:50 -08:00
Brian Behlendorf 2ec61316a8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 14:13:48 -08:00
Brian Behlendorf d8f9597730 Always include u8_textprep 2009-01-05 14:12:03 -08:00
Brian Behlendorf 212d52ed43 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-05 13:59:15 -08:00
Brian Behlendorf 6efd309371 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:59:14 -08:00
Brian Behlendorf 92dce34904 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-05 13:59:11 -08:00
Brian Behlendorf 2dddcca89a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:59:10 -08:00
Brian Behlendorf 4e41051097 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:59:09 -08:00
Brian Behlendorf 49e679bb6d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 13:59:05 -08:00
Brian Behlendorf 90531ed597 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 13:59:03 -08:00
Brian Behlendorf 0c9de0c356 Linux kernel modularize unicode 2009-01-05 13:57:26 -08:00
Brian Behlendorf eb0a6a7b00 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:30 -08:00
Brian Behlendorf 77c4ef21ab Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 13:47:29 -08:00
Brian Behlendorf d93b88872e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:26 -08:00
Brian Behlendorf b22496960e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-05 13:47:24 -08:00
Brian Behlendorf 06602b7ee5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:22 -08:00
Brian Behlendorf 889bb92210 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-05 13:47:21 -08:00
Brian Behlendorf 0e2b10395a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:17 -08:00
Brian Behlendorf 21c440291a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 13:47:16 -08:00
Brian Behlendorf e201920e64 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:13 -08:00
Brian Behlendorf eea4cc8e0e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 13:47:12 -08:00
Brian Behlendorf f926803aeb Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:09 -08:00
Brian Behlendorf d21c9b6c4b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-05 13:47:07 -08:00
Brian Behlendorf ccd532b254 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:05 -08:00
Brian Behlendorf 73e48eae6d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 13:47:03 -08:00
Brian Behlendorf 84de9dbfb4 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-05 13:47:01 -08:00
Brian Behlendorf 97dab5053e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 13:46:59 -08:00
Brian Behlendorf 7fde127c7b Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:56 -08:00
Brian Behlendorf 44e329c167 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 13:46:55 -08:00
Brian Behlendorf 61c2c91b4e Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:52 -08:00
Brian Behlendorf dbcb8f3921 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 13:46:51 -08:00
Brian Behlendorf 8cd6e99d4e Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:48 -08:00
Brian Behlendorf a9bfb78b5a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:46:47 -08:00
Brian Behlendorf 556591b23b Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:44 -08:00
Brian Behlendorf 2ce1f366f3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:46:43 -08:00
Brian Behlendorf 310ae7fd2a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:46:42 -08:00
Brian Behlendorf 63ed9925d4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:38 -08:00
Brian Behlendorf 30acc1191a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 13:46:36 -08:00
Brian Behlendorf 3bc01c0326 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:46:35 -08:00
Brian Behlendorf 9bece1f123 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:31 -08:00
Brian Behlendorf 3cff0664dc Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-05 13:46:29 -08:00
Brian Behlendorf 2c7c3f3bd6 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:26 -08:00
Brian Behlendorf 4c770d136e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-05 13:46:25 -08:00
Brian Behlendorf 3186c563fa Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:22 -08:00
Brian Behlendorf f88ab3c355 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 13:46:21 -08:00
Brian Behlendorf 7a4ce4e6aa Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:18 -08:00
Brian Behlendorf ca09b22dfb Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 13:46:17 -08:00
Brian Behlendorf bfc158397e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:14 -08:00