Commit Graph

4909 Commits

Author SHA1 Message Date
Brian Behlendorf fea7eb9fe4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:27:14 -08:00
Brian Behlendorf 189e79d404 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 13:27:09 -08:00
Brian Behlendorf 6139a7f023 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 13:27:07 -08:00
Brian Behlendorf 99c9b66c68 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-18 13:27:04 -08:00
Brian Behlendorf 836ed023b8 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-18 13:27:02 -08:00
Brian Behlendorf 3abfcee4f8 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-18 13:26:58 -08:00
Brian Behlendorf 1161edc1c5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 13:26:57 -08:00
Brian Behlendorf 417759d1c8 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-18 13:26:54 -08:00
Brian Behlendorf 3f873e3468 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-18 13:26:52 -08:00
Brian Behlendorf 923392ffae Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-18 13:26:49 -08:00
Brian Behlendorf b403d58557 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-18 13:26:47 -08:00
Brian Behlendorf 39554026a9 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-18 13:26:44 -08:00
Brian Behlendorf 8c1081cd63 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-18 13:26:42 -08:00
Brian Behlendorf 83e1d2bdbc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:26:39 -08:00
Brian Behlendorf 326018b706 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-18 13:26:36 -08:00
Brian Behlendorf 1a6091791d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:26:36 -08:00
Brian Behlendorf 8f52e45adf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:26:35 -08:00
Brian Behlendorf c04bbb0b61 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 13:26:35 -08:00
Brian Behlendorf 8eccbd95b9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:26:34 -08:00
Brian Behlendorf 163f096cb6 Resolve remove shadow, rename to rm 2008-12-18 13:24:37 -08:00
Brian Behlendorf 4bd4481e12 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 13:20:11 -08:00
Brian Behlendorf 3d19534f7a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 13:20:09 -08:00
Brian Behlendorf 2d1f3895f5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 13:20:06 -08:00
Brian Behlendorf acfcb00a6e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 13:20:04 -08:00
Brian Behlendorf 19c1117586 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 13:20:01 -08:00
Brian Behlendorf 905bd99186 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 13:19:59 -08:00
Brian Behlendorf a2ca03d45f Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:56 -08:00
Brian Behlendorf 97a0b13aec Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 13:19:54 -08:00
Brian Behlendorf 632ae68fd3 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:50 -08:00
Brian Behlendorf 1f6a2a1743 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 13:19:49 -08:00
Brian Behlendorf b6df558aa9 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:45 -08:00
Brian Behlendorf 0beb23495e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 13:19:44 -08:00
Brian Behlendorf 2691212596 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:40 -08:00
Brian Behlendorf dddf2efadf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 13:19:38 -08:00
Brian Behlendorf b496c9c387 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:35 -08:00
Brian Behlendorf e4f40f34b3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 13:19:33 -08:00
Brian Behlendorf 5578575cdf Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:30 -08:00
Brian Behlendorf 7299994fcf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 13:19:28 -08:00
Brian Behlendorf 071c9632b7 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:24 -08:00
Brian Behlendorf 1eaa464a82 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 13:19:22 -08:00
Brian Behlendorf 600ad1b343 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:19 -08:00
Brian Behlendorf 155929dfcd Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 13:19:17 -08:00
Brian Behlendorf 2fb7a5bdaa Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:14 -08:00
Brian Behlendorf 8a2a1a5b3a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 13:19:12 -08:00
Brian Behlendorf fb0de6a410 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 13:19:11 -08:00
Brian Behlendorf e01c41b1b7 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-18 13:19:06 -08:00
Brian Behlendorf 1ab1ffc591 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 13:19:04 -08:00
Brian Behlendorf e6169bf282 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:19:03 -08:00
Brian Behlendorf 6d7aa3662c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 13:18:58 -08:00
Brian Behlendorf 1d9d2ce17a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 13:18:56 -08:00