Commit Graph

5633 Commits

Author SHA1 Message Date
Brian Behlendorf 8fca960b4e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 09:53:12 -08:00
Brian Behlendorf 9f4bcfcdd8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:08 -08:00
Brian Behlendorf 475f73d0d3 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 09:53:06 -08:00
Brian Behlendorf 01b97c6100 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:03 -08:00
Brian Behlendorf 684a356d97 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 09:53:01 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf e33530897a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 09:52:54 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00
Brian Behlendorf 23d1835844 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf 2c874ef298 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:32:53 -08:00
Brian Behlendorf c479d5690e Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 09:32:51 -08:00
Brian Behlendorf 56217b4c11 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:32:50 -08:00
Brian Behlendorf cdcb2af79b Add proper header 2008-12-19 09:30:56 -08:00
Brian Behlendorf 7cf32c82f6 Refresh autogen products 2008-12-19 09:25:52 -08:00
Brian Behlendorf 9ea2ed5b47 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:08:07 -08:00
Brian Behlendorf be4900766d Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 09:08:05 -08:00
Brian Behlendorf 1e0f1b2c02 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:08:03 -08:00
Brian Behlendorf a1e023d7a4 Add strtoxx functions 2008-12-19 09:05:50 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 6d2b828309 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 14:01:13 -08:00
Brian Behlendorf a2d3887150 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-18 14:01:11 -08:00
Brian Behlendorf b24fd66431 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 14:01:10 -08:00
Brian Behlendorf 3592f996a1 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 14:01:08 -08:00
Brian Behlendorf d7384267c1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 14:01:05 -08:00
Brian Behlendorf f0cd52ac24 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 14:01:04 -08:00
Brian Behlendorf b2cf57f95d Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 14:01:00 -08:00
Brian Behlendorf 86efaab133 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 14:00:58 -08:00
Brian Behlendorf 066276221c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:55 -08:00
Brian Behlendorf fcf5a35996 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 14:00:54 -08:00
Brian Behlendorf 9503da459e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:50 -08:00
Brian Behlendorf ccbc8aee4e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 14:00:48 -08:00
Brian Behlendorf c6b1cb5c52 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:45 -08:00
Brian Behlendorf e03fd4ee53 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 14:00:43 -08:00
Brian Behlendorf 385f41020f Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:40 -08:00
Brian Behlendorf e160d4ae71 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 14:00:39 -08:00
Brian Behlendorf b847ea0ea8 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:35 -08:00
Brian Behlendorf 2e2a50a803 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 14:00:34 -08:00
Brian Behlendorf 03466cf15e Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:31 -08:00
Brian Behlendorf 7e97677d57 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 14:00:29 -08:00
Brian Behlendorf 384a79520d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:25 -08:00
Brian Behlendorf 89dc5c66f3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 14:00:23 -08:00
Brian Behlendorf 2829ed10ea Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:20 -08:00
Brian Behlendorf d57671e03a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 14:00:19 -08:00
Brian Behlendorf 7c53aaa4a7 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 14:00:15 -08:00
Brian Behlendorf fd210745fd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 14:00:14 -08:00