Commit Graph

13925 Commits

Author SHA1 Message Date
Brian Behlendorf bbefda7821 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-21 17:13:28 -07:00
Brian Behlendorf a2450e7e79 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-21 17:13:27 -07:00
Brian Behlendorf 7e42fe84f2 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-21 17:13:13 -07:00
Brian Behlendorf 651171b615 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-21 17:13:11 -07:00
Brian Behlendorf e94ba2ffb4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-21 17:13:10 -07:00
Brian Behlendorf bf9473d285 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-21 17:12:56 -07:00
Brian Behlendorf d3cdde6150 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-21 17:12:49 -07:00
Brian Behlendorf c06df6056c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-21 17:12:41 -07:00
Brian Behlendorf 2aebadd6f3 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-21 17:12:39 -07:00
Brian Behlendorf 7d3728242f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-21 17:12:32 -07:00
Brian Behlendorf e0f858d0a8 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-21 17:12:30 -07:00
Brian Behlendorf 7b17084bc1 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-21 17:12:23 -07:00
Brian Behlendorf de7161ec92 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-21 17:12:16 -07:00
Brian Behlendorf 00298f0a9a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-21 17:12:05 -07:00
Brian Behlendorf dfda425fea Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-21 17:12:03 -07:00
Brian Behlendorf a7df4eaa18 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-21 17:11:56 -07:00
Brian Behlendorf c1df2f2959 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-21 17:11:54 -07:00
Brian Behlendorf e85aaac131 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-21 17:11:47 -07:00
Brian Behlendorf 2bfdf4079b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-21 17:11:45 -07:00
Brian Behlendorf bc8c87d2f3 Missed one instance of losetup -f to unused_loop_device change 2009-07-21 17:05:13 -07:00
Brian Behlendorf d996632f3a Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-21 16:33:15 -07:00
Brian Behlendorf f974187b96 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-21 16:33:10 -07:00
Brian Behlendorf 13c3e6fac3 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-21 16:33:03 -07:00
Brian Behlendorf 24d582f0ee Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-21 16:32:56 -07:00
Brian Behlendorf a81af545b6 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:48 -07:00
Brian Behlendorf 68ae8401f7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-21 16:32:46 -07:00
Brian Behlendorf f81cc4926f Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:39 -07:00
Brian Behlendorf 49ba99f4b6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-21 16:32:37 -07:00
Brian Behlendorf 8d7f5c2022 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:29 -07:00
Brian Behlendorf 44306404b6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-21 16:32:28 -07:00
Brian Behlendorf e35a529ba6 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:20 -07:00
Brian Behlendorf 8e5f7bd9d5 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-21 16:32:18 -07:00
Brian Behlendorf d3569435bd Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:10 -07:00
Brian Behlendorf bb3405ded1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-21 16:32:09 -07:00
Brian Behlendorf 4180ead2ec Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-21 16:32:01 -07:00
Brian Behlendorf da4d848123 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-21 16:31:59 -07:00
Brian Behlendorf 8ca6542f5b Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-21 16:31:52 -07:00
Brian Behlendorf e4368a79e0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-21 16:31:49 -07:00
Brian Behlendorf 4d37a1263c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-21 16:31:40 -07:00
Brian Behlendorf d7f270f457 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-21 16:31:38 -07:00
Brian Behlendorf 42ff0054eb Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-21 16:31:30 -07:00
Brian Behlendorf 065e0a1b5d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-21 16:31:29 -07:00
Brian Behlendorf 99ce24b54a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-21 16:31:17 -07:00
Brian Behlendorf 04781a1a18 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-21 16:31:15 -07:00
Brian Behlendorf 1d1dcc6df1 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-21 16:31:08 -07:00
Brian Behlendorf 69feba5464 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-21 16:31:06 -07:00
Brian Behlendorf 0e215424e6 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-21 16:31:05 -07:00
Brian Behlendorf 77cd6f99f0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-21 16:30:51 -07:00
Brian Behlendorf bcabe843b5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-21 16:30:50 -07:00
Brian Behlendorf 71827f878a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-21 16:30:49 -07:00