Commit Graph

3079 Commits

Author SHA1 Message Date
Brian Behlendorf 9a30c4847f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:38:43 -08:00
Brian Behlendorf 059229f8eb Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:40 -08:00
Brian Behlendorf a77d8e31b3 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 10:38:39 -08:00
Brian Behlendorf 6d1511fb27 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:36 -08:00
Brian Behlendorf 3ce4c0c0a2 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 10:38:35 -08:00
Brian Behlendorf 387f88e5f0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:31 -08:00
Brian Behlendorf d60f962547 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:38:30 -08:00
Brian Behlendorf 91b38929e3 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:27 -08:00
Brian Behlendorf 298c3e1736 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:38:26 -08:00
Brian Behlendorf b0b2265e79 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:24 -08:00
Brian Behlendorf 92afe68367 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:38:23 -08:00
Brian Behlendorf 86d63784a5 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:20 -08:00
Brian Behlendorf 5b7cbb0234 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:38:19 -08:00
Brian Behlendorf be2f87acea Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:16 -08:00
Brian Behlendorf d7ac648d3e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:38:15 -08:00
Brian Behlendorf 675e853f48 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:12 -08:00
Brian Behlendorf 07f84cad28 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:38:11 -08:00
Brian Behlendorf 1cce2945a5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:38:10 -08:00
Brian Behlendorf 20ba9a7bbd Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 10:38:05 -08:00
Brian Behlendorf 7ffc0810b8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 10:38:04 -08:00
Brian Behlendorf 7eb016ef42 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:38:04 -08:00
Brian Behlendorf cdac19f972 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:59 -08:00
Brian Behlendorf 58842db464 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:37:58 -08:00
Brian Behlendorf fcccc5be2a Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:55 -08:00
Brian Behlendorf b8f52262fa Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 10:37:54 -08:00
Brian Behlendorf 7ccfedf452 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:51 -08:00
Brian Behlendorf 4ffa0c8e19 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:37:49 -08:00
Brian Behlendorf 7d92a8a43e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:46 -08:00
Brian Behlendorf 88bb3c1fb8 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 10:37:45 -08:00
Brian Behlendorf 813b7d2735 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:42 -08:00
Brian Behlendorf 415502c12c Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 10:37:41 -08:00
Brian Behlendorf 4d284f6066 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 10:37:38 -08:00
Brian Behlendorf af2f3f4aca Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:38 -08:00
Brian Behlendorf d7761f89ae Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:35 -08:00
Brian Behlendorf 2af47c207e Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 10:37:33 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 323d5b5414 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:38 -08:00
Brian Behlendorf 2fcd44d670 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:30:37 -08:00
Brian Behlendorf f52228fee3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:34 -08:00
Brian Behlendorf 2ab5f87b98 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 10:30:33 -08:00
Brian Behlendorf a57c80b5c0 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:30 -08:00
Brian Behlendorf 7d298e6524 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:30:28 -08:00
Brian Behlendorf 8616f5d268 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:26 -08:00
Brian Behlendorf 7ba551c5c5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 10:30:25 -08:00
Brian Behlendorf a64dda0ff1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:22 -08:00
Brian Behlendorf 08d0bc7b3b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 10:30:21 -08:00
Brian Behlendorf fd6fc3eb7f Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:18 -08:00
Brian Behlendorf 127459b37c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:30:17 -08:00
Brian Behlendorf baf6f9bad2 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:13 -08:00
Brian Behlendorf c8ab2566a1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:30:12 -08:00