Commit Graph

2783 Commits

Author SHA1 Message Date
Brian Behlendorf bb23271675 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 12:15:10 -08:00
Brian Behlendorf 4a3b280b22 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 12:15:08 -08:00
Brian Behlendorf cc67d6a03e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 12:15:06 -08:00
Brian Behlendorf 7bf7d028a7 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:57 -08:00
Brian Behlendorf 4df31a796e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 12:14:54 -08:00
Brian Behlendorf ea3adc331a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 12:14:52 -08:00
Brian Behlendorf aa69bfc29c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:41 -08:00
Brian Behlendorf 4d9dd57c96 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 12:14:39 -08:00
Brian Behlendorf 0fffebdbe8 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:32 -08:00
Brian Behlendorf 213be8b8c6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 12:14:29 -08:00
Brian Behlendorf 6b3282a023 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:22 -08:00
Brian Behlendorf 3c36f366f0 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 12:14:19 -08:00
Brian Behlendorf 42cc88c62a Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:12 -08:00
Brian Behlendorf 736dc9fdd6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 12:14:10 -08:00
Brian Behlendorf 5ef1c86907 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 12:14:04 -08:00
Brian Behlendorf 20301678dc Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 12:14:03 -08:00
Brian Behlendorf 902587a76c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 12:13:58 -08:00
Brian Behlendorf 9bd483b7e1 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 12:13:56 -08:00
Brian Behlendorf 4d2cd6e70a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 12:13:50 -08:00
Brian Behlendorf b58a16492e Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 12:13:44 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf e1db87107d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-12 12:13:40 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf 769681a8b9 Trivial umem implementation if portable umem unavailable 2008-12-12 12:10:00 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf b35eb115d7 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:49 -08:00
Brian Behlendorf bbaded4a68 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:07:48 -08:00
Brian Behlendorf 42f72e194e Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:45 -08:00
Brian Behlendorf 0d8ee2ef3e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 11:07:44 -08:00
Brian Behlendorf cc967c23ef Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:41 -08:00
Brian Behlendorf 07973aa4b5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 11:07:40 -08:00
Brian Behlendorf 2e8c5a8dd1 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:37 -08:00
Brian Behlendorf 84944e62b6 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 11:07:36 -08:00
Brian Behlendorf 2631db0063 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:33 -08:00
Brian Behlendorf f61fdc6c5a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 11:07:32 -08:00
Brian Behlendorf fa6f59d307 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:29 -08:00
Brian Behlendorf 0d8f315e3d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 11:07:28 -08:00
Brian Behlendorf 3dcb4f5331 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:25 -08:00
Brian Behlendorf 4e3a43cb70 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 11:07:24 -08:00
Brian Behlendorf a044ae9743 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:21 -08:00
Brian Behlendorf 3088684851 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 11:07:20 -08:00
Brian Behlendorf 4b9680936d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:17 -08:00
Brian Behlendorf c51c9226a5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 11:07:16 -08:00
Brian Behlendorf 1c3d72b358 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:13 -08:00
Brian Behlendorf 3d753d3be5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 11:07:12 -08:00
Brian Behlendorf bd60d32406 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:08 -08:00
Brian Behlendorf a46fb06d3f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 11:07:07 -08:00
Brian Behlendorf 88de88c1b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 11:07:07 -08:00
Brian Behlendorf 683121d251 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 11:07:01 -08:00