Commit Graph

17683 Commits

Author SHA1 Message Date
Brian Behlendorf 3d91e41dbe Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:48 -08:00
Brian Behlendorf ec83f26aee Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-05 14:58:47 -08:00
Brian Behlendorf 03b30ef16b Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:45 -08:00
Brian Behlendorf 9f228d68d9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-05 14:58:44 -08:00
Brian Behlendorf 3ea1fbdb1c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:41 -08:00
Brian Behlendorf 806e660116 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-05 14:58:40 -08:00
Brian Behlendorf 71d765a392 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-05 14:58:37 -08:00
Brian Behlendorf 17956c43bd Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:37 -08:00
Brian Behlendorf b032f6706d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:34 -08:00
Brian Behlendorf 369e865989 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-05 14:58:33 -08:00
Brian Behlendorf 2e173c0882 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:30 -08:00
Brian Behlendorf eba975d32f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-05 14:58:29 -08:00
Brian Behlendorf 33db2b8914 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:27 -08:00
Brian Behlendorf 9f0e6c4e0b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-05 14:58:26 -08:00
Brian Behlendorf d923b52ac7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-05 14:58:25 -08:00
Brian Behlendorf c5d3c3715c Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:21 -08:00
Brian Behlendorf e3b9592641 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-05 14:58:20 -08:00
Brian Behlendorf 7d90609a09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-05 14:58:19 -08:00
Brian Behlendorf b52846203c Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:14 -08:00
Brian Behlendorf a1b0cae545 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-05 14:58:13 -08:00
Brian Behlendorf 1de758a008 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:11 -08:00
Brian Behlendorf 4fa459ad6d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-05 14:58:10 -08:00
Brian Behlendorf 2e952c9af7 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:07 -08:00
Brian Behlendorf d07a125005 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-05 14:58:06 -08:00
Brian Behlendorf 3ae1113d68 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-05 14:58:03 -08:00
Brian Behlendorf 7c544db6cf Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:03 -08:00
Brian Behlendorf f89c16f8ec Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-05 14:58:00 -08:00
Brian Behlendorf f555b1a660 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-05 14:57:59 -08:00
Brian Behlendorf 93f584e9b0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-05 14:57:56 -08:00
Brian Behlendorf cf8a381ad7 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-05 14:57:55 -08:00
Brian Behlendorf cdc27522c1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-05 14:57:53 -08:00
Brian Behlendorf a73fec7242 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-05 14:57:52 -08:00
Brian Behlendorf 9405542384 Update EXTRA_DIST 2008-12-05 14:56:15 -08:00
Brian Behlendorf 15a35e5c7d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-05 14:53:44 -08:00
Brian Behlendorf 1ab0371342 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:44 -08:00
Brian Behlendorf e8f84f67ed Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:41 -08:00
Brian Behlendorf 8c87bf1062 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-05 14:53:40 -08:00
Brian Behlendorf 6966fd88d2 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:37 -08:00
Brian Behlendorf edd8ad8573 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-05 14:53:36 -08:00
Brian Behlendorf 854a48a354 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:33 -08:00
Brian Behlendorf 0943ebe71f Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-05 14:53:32 -08:00
Brian Behlendorf 4e69a8065a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:29 -08:00
Brian Behlendorf b9122bd134 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-05 14:53:28 -08:00
Brian Behlendorf 104a367047 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-05 14:53:25 -08:00
Brian Behlendorf 9c491264d1 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:25 -08:00
Brian Behlendorf b78abbe7ca Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-05 14:53:21 -08:00
Brian Behlendorf edf7e9c52b Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:21 -08:00
Brian Behlendorf a9b1a91897 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-05 14:53:17 -08:00
Brian Behlendorf e021630aac Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:17 -08:00
Brian Behlendorf f7af5c6945 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-05 14:53:14 -08:00