Commit Graph

15375 Commits

Author SHA1 Message Date
Brian Behlendorf 3b62dfad5c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-10-09 16:13:03 -07:00
Brian Behlendorf 85583ef387 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-10-09 16:12:57 -07:00
Brian Behlendorf fc2213dfac Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
Conflicts:

	lib/Makefile.am
2009-10-09 16:12:49 -07:00
Brian Behlendorf 9b0ece49a4 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-10-09 16:10:04 -07:00
Brian Behlendorf 8fbaf287d7 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-09 16:10:02 -07:00
Brian Behlendorf 1fe3d2fd7b Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:56 -07:00
Brian Behlendorf 7c073d0a7d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:09:54 -07:00
Brian Behlendorf 42e6947436 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:48 -07:00
Brian Behlendorf ce6ad30cbb Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-10-09 16:09:46 -07:00
Brian Behlendorf 872d3f202f Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:40 -07:00
Brian Behlendorf 2001a56428 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-10-09 16:09:38 -07:00
Brian Behlendorf 1cacce9e7d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:32 -07:00
Brian Behlendorf 040e6c020f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-10-09 16:09:30 -07:00
Brian Behlendorf 66ccf80585 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:24 -07:00
Brian Behlendorf e9a58f7148 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-10-09 16:09:22 -07:00
Brian Behlendorf fbd385e311 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:16 -07:00
Brian Behlendorf f0e7c21dfc Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-10-09 16:09:14 -07:00
Brian Behlendorf 9a91c646b3 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-10-09 16:09:08 -07:00
Brian Behlendorf 4093dd012f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-10-09 16:09:07 -07:00
Brian Behlendorf b01738b4aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-10-09 16:09:06 -07:00
Brian Behlendorf e59921aa80 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-10-09 16:08:55 -07:00
Brian Behlendorf 8ca9436915 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-10-09 16:08:53 -07:00
Brian Behlendorf 60f818719c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-10-09 16:08:52 -07:00
Brian Behlendorf 64e3eb8a79 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-10-09 16:08:41 -07:00
Brian Behlendorf a84ca33e2f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-10-09 16:08:40 -07:00
Brian Behlendorf 6ba2029a1e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-10-09 16:08:34 -07:00
Brian Behlendorf 1167bd1a6e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-10-09 16:08:32 -07:00
Brian Behlendorf 179535aac3 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-10-09 16:08:26 -07:00
Brian Behlendorf 2fbcf94bce Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-10-09 16:08:24 -07:00
Brian Behlendorf 8cafc7c6da Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-10-09 16:08:19 -07:00
Brian Behlendorf 1bee1a4dda Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-10-09 16:08:17 -07:00
Brian Behlendorf a740d2a8f7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/Makefile.am
2009-10-09 16:06:51 -07:00
Brian Behlendorf aed86aa54e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-10-09 16:03:08 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf 67fc15510b Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-10-09 15:46:13 -07:00
Brian Behlendorf 89f2bafc9c Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-10-09 15:46:11 -07:00
Brian Behlendorf 87c581072f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-10-09 15:46:05 -07:00
Brian Behlendorf 5507884803 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-10-09 15:46:03 -07:00
Brian Behlendorf f682d5a349 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:57 -07:00
Brian Behlendorf c3b45fe669 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-09 15:45:55 -07:00
Brian Behlendorf 8e3f966358 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:49 -07:00
Brian Behlendorf a4665e8ed8 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-10-09 15:45:46 -07:00
Brian Behlendorf d2d72c560d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:40 -07:00
Brian Behlendorf 746882c100 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-10-09 15:45:38 -07:00
Brian Behlendorf 60a435ec49 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:31 -07:00
Brian Behlendorf cd82cb1836 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-10-09 15:45:30 -07:00
Brian Behlendorf d34a8d0320 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:23 -07:00
Brian Behlendorf 503c5eeb2d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 15:45:22 -07:00
Brian Behlendorf a2f22b1880 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-10-09 15:45:16 -07:00
Brian Behlendorf a2c9b6108b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-10-09 15:45:14 -07:00