Commit Graph

3856 Commits

Author SHA1 Message Date
Brian Behlendorf a22f0913a6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 14:29:04 -08:00
Brian Behlendorf b9a42bb02a Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 14:29:01 -08:00
Brian Behlendorf 07122a3b4a Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 14:28:59 -08:00
Brian Behlendorf 00fa98c5cf Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:28:56 -08:00
Brian Behlendorf 1d20aa29d5 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 14:28:55 -08:00
Brian Behlendorf 50532fe67b Refresh Makefile 2008-12-12 14:27:04 -08:00
Brian Behlendorf 2051c5740b Refresh Makefile 2008-12-12 14:26:14 -08:00
Brian Behlendorf ea7b6ea954 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-12 14:22:29 -08:00
Brian Behlendorf 1219884686 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 14:22:28 -08:00
Brian Behlendorf e0db7f116d Resolve conflict 2008-12-12 14:22:23 -08:00
Brian Behlendorf b3606e56db Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:52 -08:00
Brian Behlendorf ce15032d4f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 14:21:51 -08:00
Brian Behlendorf c278d333ac Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:48 -08:00
Brian Behlendorf 712ecbdc1c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 14:21:47 -08:00
Brian Behlendorf 14ddcd0b5e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:44 -08:00
Brian Behlendorf 611af8dcda Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:21:43 -08:00
Brian Behlendorf 251a1c4f2a Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:39 -08:00
Brian Behlendorf a404fc40d4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:21:38 -08:00
Brian Behlendorf f95ca18b30 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:35 -08:00
Brian Behlendorf b0739044fe Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 14:21:34 -08:00
Brian Behlendorf e420ed24df Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:31 -08:00
Brian Behlendorf fb1da23066 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 14:21:29 -08:00
Brian Behlendorf f2a7724084 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:25 -08:00
Brian Behlendorf 0adbfd4cfb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:21:24 -08:00
Brian Behlendorf 49a975f0d0 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:20 -08:00
Brian Behlendorf bc55a1e29b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 14:21:19 -08:00
Brian Behlendorf d42c443a8a Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:15 -08:00
Brian Behlendorf 9d3a835a0f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:21:14 -08:00
Brian Behlendorf daf54d1001 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:11 -08:00
Brian Behlendorf f1132655d6 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 14:21:10 -08:00
Brian Behlendorf 3a440f5607 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 14:21:09 -08:00
Brian Behlendorf f33088b3f4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-12 14:21:04 -08:00
Brian Behlendorf 6278a8f9a5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 14:21:02 -08:00
Brian Behlendorf 2db44f84d7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:21:02 -08:00
Brian Behlendorf d445c410fb Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:56 -08:00
Brian Behlendorf 948a4e0e2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:20:55 -08:00
Brian Behlendorf 9c1484a97e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:52 -08:00
Brian Behlendorf 5acf1eec02 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 14:20:51 -08:00
Brian Behlendorf 8b7107d34d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:48 -08:00
Brian Behlendorf ea758a9eea Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 14:20:46 -08:00
Brian Behlendorf c3d42b2d23 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:43 -08:00
Brian Behlendorf 23c4e402f7 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 14:20:42 -08:00
Brian Behlendorf c290cb527d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:39 -08:00
Brian Behlendorf 570200410e Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-12 14:20:38 -08:00
Brian Behlendorf 2ee3f66f0d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-12 14:20:35 -08:00
Brian Behlendorf 724265224b Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-12 14:20:34 -08:00
Brian Behlendorf 1bbe898289 Resolve conflict 2008-12-12 14:19:55 -08:00
Brian Behlendorf d28f2403f2 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-12 14:18:44 -08:00
Brian Behlendorf 5a27f3f0a5 Comment out libzpool builds for now 2008-12-12 14:16:50 -08:00
Brian Behlendorf acfdb41034 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-12 14:08:15 -08:00