Commit Graph

6161 Commits

Author SHA1 Message Date
Brian Behlendorf 530b2e6564 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 09:54:15 -08:00
Brian Behlendorf 069e5a9703 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:12 -08:00
Brian Behlendorf 0f22033b0a Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 09:54:09 -08:00
Brian Behlendorf 255e78bd8a Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:06 -08:00
Brian Behlendorf e17e93da32 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 09:54:04 -08:00
Brian Behlendorf f4ea43fbfc Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:00 -08:00
Brian Behlendorf ec916d278e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 09:53:57 -08:00
Brian Behlendorf baf0ac5825 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:54 -08:00
Brian Behlendorf 9a20c1615b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 09:53:52 -08:00
Brian Behlendorf 2462b347c9 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:48 -08:00
Brian Behlendorf aa773011d1 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 09:53:46 -08:00
Brian Behlendorf 72f0470ded Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 09:53:46 -08:00
Brian Behlendorf fc7e8ad2d9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:40 -08:00
Brian Behlendorf 07e52b7450 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 09:53:38 -08:00
Brian Behlendorf 1a0d43ceac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 09:53:37 -08:00
Brian Behlendorf 917fa35bf8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:31 -08:00
Brian Behlendorf 4c00aff74b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 09:53:29 -08:00
Brian Behlendorf b5a60fecb8 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:25 -08:00
Brian Behlendorf ed7b471adc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 09:53:23 -08:00
Brian Behlendorf ecadaa6722 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:19 -08:00
Brian Behlendorf 10fd4b002f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 09:53:17 -08:00
Brian Behlendorf d89b9842de Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:14 -08:00
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 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 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 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