Commit Graph

6018 Commits

Author SHA1 Message Date
Brian Behlendorf e8cf9a7d8d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 09:26:44 -08:00
Brian Behlendorf a6411c9b1e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:41 -08:00
Brian Behlendorf d17d4a5875 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 09:26:39 -08:00
Brian Behlendorf abb88eac68 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:36 -08:00
Brian Behlendorf d52676f52b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:26:35 -08:00
Brian Behlendorf 1cdad323ca Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:31 -08:00
Brian Behlendorf f1071ac43b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 09:26:30 -08:00
Brian Behlendorf 93df5fbb3f Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:27 -08:00
Brian Behlendorf 4e1fe142d3 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 09:26:26 -08:00
Brian Behlendorf 681b849ce0 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:22 -08:00
Brian Behlendorf 74797bf41e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 09:26:21 -08:00
Brian Behlendorf 4b614b4f35 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 09:26:20 -08:00
Brian Behlendorf 8db834ec91 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:15 -08:00
Brian Behlendorf 034a93dacb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 09:26:14 -08:00
Brian Behlendorf 978bee45d8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 09:26:13 -08:00
Brian Behlendorf e00fb0ceff Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:08 -08:00
Brian Behlendorf d7a8b2ef6f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 09:26:06 -08:00
Brian Behlendorf 5423e7f82c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 09:26:03 -08:00
Brian Behlendorf 4cdb578ceb Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 09:26:01 -08:00
Brian Behlendorf 889c606d0e Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 09:25:58 -08:00
Brian Behlendorf c60d76734b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 09:25:57 -08:00
Brian Behlendorf dd863cac7f Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 09:25:54 -08:00
Brian Behlendorf b608990fea Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:25:52 -08:00
Brian Behlendorf 12cbd489a8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 09:25:49 -08:00
Brian Behlendorf 6263832a14 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 09:25:48 -08:00
Brian Behlendorf 0d606b2da4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 09:25:45 -08:00
Brian Behlendorf 8b633147e8 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 09:25:43 -08:00
Brian Behlendorf ecf38d314e Resolve conflict 2008-12-22 09:25:04 -08:00
Brian Behlendorf cd11c5157b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 09:24:30 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf 791f719dc0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:29 -08:00
Brian Behlendorf 7577be2acd Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 09:13:27 -08:00
Brian Behlendorf 714520a6e4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:24 -08:00
Brian Behlendorf 67fec8c831 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 09:13:23 -08:00
Brian Behlendorf be056164a3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:19 -08:00
Brian Behlendorf 70f4b7e8c2 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 09:13:18 -08:00
Brian Behlendorf 31bf92ad34 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:15 -08:00
Brian Behlendorf d1ff9a15ca Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 09:13:13 -08:00
Brian Behlendorf 39b2206c0d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:10 -08:00
Brian Behlendorf 6d1b9b5ef6 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 09:13:08 -08:00
Brian Behlendorf 2a679e67ec Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:05 -08:00
Brian Behlendorf 1f124bcde3 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 09:13:04 -08:00
Brian Behlendorf 456f6465c8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 09:13:01 -08:00
Brian Behlendorf ab44ff2164 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 09:12:59 -08:00
Brian Behlendorf 4ae19302a8 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 09:12:56 -08:00
Brian Behlendorf 6609fd32f8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 09:12:54 -08:00
Brian Behlendorf 7a141d033d Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 09:12:51 -08:00
Brian Behlendorf 894c412b86 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:12:50 -08:00
Brian Behlendorf 31cbb18aef Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 09:12:46 -08:00
Brian Behlendorf d34a1c1e88 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 09:12:45 -08:00