Commit Graph

4615 Commits

Author SHA1 Message Date
Brian Behlendorf e21155cbdf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 12:16:18 -08:00
Brian Behlendorf 1990be9708 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-17 12:16:10 -08:00
Brian Behlendorf e3313b241b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 12:16:08 -08:00
Brian Behlendorf 20ebb3dd3a Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-17 12:16:02 -08:00
Brian Behlendorf 6cfaba6688 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 12:15:59 -08:00
Brian Behlendorf 727e833fa6 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-17 12:15:52 -08:00
Brian Behlendorf c0e4b0cc84 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 12:15:49 -08:00
Brian Behlendorf fe7d776569 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 12:15:47 -08:00
Brian Behlendorf 8d06f7d59b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-17 12:15:35 -08:00
Brian Behlendorf 956a8280a3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 12:15:28 -08:00
Brian Behlendorf 895bbc24db Refresh context 2008-12-17 12:15:21 -08:00
Brian Behlendorf 62c2bbabda Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:51 -08:00
Brian Behlendorf 9a10c42b65 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-17 11:52:50 -08:00
Brian Behlendorf 89bda8d046 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:46 -08:00
Brian Behlendorf 5f7eabe114 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 11:52:45 -08:00
Brian Behlendorf c6e81248b8 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:42 -08:00
Brian Behlendorf fc53074e3c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 11:52:40 -08:00
Brian Behlendorf b216fda31c Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:37 -08:00
Brian Behlendorf d912ed0f64 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-17 11:52:35 -08:00
Brian Behlendorf 150e370822 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:32 -08:00
Brian Behlendorf 017a76f754 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-17 11:52:31 -08:00
Brian Behlendorf 3064b92854 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-17 11:52:28 -08:00
Brian Behlendorf 54e3b51324 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-17 11:52:26 -08:00
Brian Behlendorf 126e1d5d92 Resolve conflict 2008-12-17 11:51:43 -08:00
Brian Behlendorf e39632c754 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-17 11:50:42 -08:00
Brian Behlendorf 385d51ad69 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:50:42 -08:00
Brian Behlendorf 6a509b3bca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:50:41 -08:00
Brian Behlendorf ccb0a865ab Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 3719c4146d Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 77811f8236 Fix prototype 2008-12-17 11:48:40 -08:00
Brian Behlendorf 2165d45cb4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:53 -08:00
Brian Behlendorf eebeedfaff Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-17 11:37:52 -08:00
Brian Behlendorf 4f4517c083 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:49 -08:00
Brian Behlendorf 33b73cd800 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 11:37:48 -08:00
Brian Behlendorf 46eb2fb390 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:44 -08:00
Brian Behlendorf f327cc0a5e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-17 11:37:43 -08:00
Brian Behlendorf 35faf321ef Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:40 -08:00
Brian Behlendorf e91e5900c3 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 11:37:38 -08:00
Brian Behlendorf c5a5c9c9e8 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:35 -08:00
Brian Behlendorf 06e7d7d2e5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 11:37:34 -08:00
Brian Behlendorf d13ecd4a11 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:31 -08:00
Brian Behlendorf 0e1addbcc1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 11:37:29 -08:00
Brian Behlendorf 1c749e8c00 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:26 -08:00
Brian Behlendorf c6a6196628 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-17 11:37:25 -08:00
Brian Behlendorf 7848fc3b6a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:22 -08:00
Brian Behlendorf 20d68f829e Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-17 11:37:20 -08:00
Brian Behlendorf 53a70d2727 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:17 -08:00
Brian Behlendorf bda39e3f52 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:37:16 -08:00
Brian Behlendorf ef912bcafb Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-17 11:37:12 -08:00
Brian Behlendorf 8d0ab2e4a0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 11:37:11 -08:00