Commit Graph

5728 Commits

Author SHA1 Message Date
Brian Behlendorf 1145e7421e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:35 -08:00
Brian Behlendorf 96699da1db Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 13:47:34 -08:00
Brian Behlendorf 48b1a39274 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:30 -08:00
Brian Behlendorf 587a8224e2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 13:47:29 -08:00
Brian Behlendorf 3c28d62f61 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:26 -08:00
Brian Behlendorf 5fe340f549 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 13:47:25 -08:00
Brian Behlendorf fd7ac68c8c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:22 -08:00
Brian Behlendorf 2e4d07ac7b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 13:47:20 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf f54b79e211 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf 2d1e4c8339 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:53 -08:00
Brian Behlendorf 1f2ec6b6cd Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 13:38:51 -08:00
Brian Behlendorf 3dd19d92cc Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:48 -08:00
Brian Behlendorf d6013ca22b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 13:38:47 -08:00
Brian Behlendorf 6b336be110 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:44 -08:00
Brian Behlendorf 0e5b5c701c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 13:38:42 -08:00
Brian Behlendorf 4374eeaf6d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:39 -08:00
Brian Behlendorf 3579c5ac5a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 13:38:38 -08:00
Brian Behlendorf 52bfba953b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:35 -08:00
Brian Behlendorf ee207876f5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 13:38:33 -08:00
Brian Behlendorf 127912d553 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:30 -08:00
Brian Behlendorf f5d11f37bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 13:38:29 -08:00
Brian Behlendorf 0f73af1443 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:26 -08:00
Brian Behlendorf d04ad444b9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 13:38:25 -08:00
Brian Behlendorf 818edba02c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:22 -08:00
Brian Behlendorf 1bc31e70db Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 13:38:20 -08:00
Brian Behlendorf 44471edb78 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:17 -08:00
Brian Behlendorf fbc711944c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 13:38:16 -08:00
Brian Behlendorf 343b5df16a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:12 -08:00
Brian Behlendorf f4ff14afdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 13:38:11 -08:00
Brian Behlendorf ec053bced3 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:08 -08:00
Brian Behlendorf 0127d5e65b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 13:38:07 -08:00
Brian Behlendorf 3f8a7ba08b Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:04 -08:00
Brian Behlendorf 4f60483c0f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 13:38:03 -08:00
Brian Behlendorf fc45f65ed8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:38:02 -08:00
Brian Behlendorf 2338849c28 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:57 -08:00
Brian Behlendorf f8b1b642ba Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 13:37:56 -08:00
Brian Behlendorf 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -08:00
Brian Behlendorf 270dc7ff16 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:50 -08:00
Brian Behlendorf 5f5ec65f60 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 13:37:48 -08:00
Brian Behlendorf edcac42a3e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:45 -08:00
Brian Behlendorf 91e1f08ddf Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 13:37:44 -08:00
Brian Behlendorf 062a43c97d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:41 -08:00
Brian Behlendorf 102a98af37 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 13:37:40 -08:00
Brian Behlendorf a06b196074 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:36 -08:00
Brian Behlendorf 0bf5516c1e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 13:37:35 -08:00
Brian Behlendorf de655a6dbd Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:32 -08:00