Commit Graph

12183 Commits

Author SHA1 Message Date
Brian Behlendorf 3862710260 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-08 13:51:06 -08:00
Brian Behlendorf fb6e888e75 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-08 13:51:05 -08:00
Brian Behlendorf 0777cfeffd Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-08 13:51:02 -08:00
Brian Behlendorf c4e8654425 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-08 13:51:01 -08:00
Brian Behlendorf 340c5e2a36 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-08 13:50:58 -08:00
Brian Behlendorf c34a9cf66d Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:58 -08:00
Brian Behlendorf ffdcab83c5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-08 13:50:57 -08:00
Brian Behlendorf 7f2aea91f6 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:52 -08:00
Brian Behlendorf 61d601df17 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-08 13:50:51 -08:00
Brian Behlendorf ae6a37c7eb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-08 13:50:51 -08:00
Brian Behlendorf ffe582a9d3 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-08 13:50:45 -08:00
Brian Behlendorf 3964102889 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:45 -08:00
Brian Behlendorf b2e9021c7b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:42 -08:00
Brian Behlendorf d22f5eeeed Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-08 13:50:41 -08:00
Brian Behlendorf 5f556a2cf5 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:38 -08:00
Brian Behlendorf 06ff99cfa3 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-08 13:50:37 -08:00
Brian Behlendorf 40ad9412d3 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:34 -08:00
Brian Behlendorf dad1d28a2b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 13:50:33 -08:00
Brian Behlendorf a4012234f6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-08 13:50:30 -08:00
Brian Behlendorf fb6974dd4d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:30 -08:00
Brian Behlendorf 0ae1472549 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:27 -08:00
Brian Behlendorf ae99dbdf97 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-08 13:50:26 -08:00
Brian Behlendorf 2a8f41725b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:23 -08:00
Brian Behlendorf f677e571a5 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-08 13:50:22 -08:00
Brian Behlendorf 93b07767fb Add missing libspl/zu.c stub 2008-12-08 13:48:38 -08:00
Brian Behlendorf e944b6b060 Add sys/int_limits.h stub 2008-12-08 13:47:21 -08:00
Brian Behlendorf 815b41e8d1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:30 -08:00
Brian Behlendorf f60a240fea Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 11:29:29 -08:00
Brian Behlendorf ffec02631c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:26 -08:00
Brian Behlendorf 8a68cf110a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-08 11:29:25 -08:00
Brian Behlendorf 6754ee8239 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:22 -08:00
Brian Behlendorf b17fa27049 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-08 11:29:21 -08:00
Brian Behlendorf 452b88c5f8 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-08 11:29:18 -08:00
Brian Behlendorf 93b1dbe52b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:18 -08:00
Brian Behlendorf e39a5b659c Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:15 -08:00
Brian Behlendorf 0d0c82f905 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-08 11:29:14 -08:00
Brian Behlendorf f8135f6380 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:11 -08:00
Brian Behlendorf d9bdf333ed Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-08 11:29:10 -08:00
Brian Behlendorf d20f4a6bbb Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:07 -08:00
Brian Behlendorf 082a572553 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-08 11:29:06 -08:00
Brian Behlendorf 41ab43a655 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-08 11:29:03 -08:00
Brian Behlendorf 0286789064 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-08 11:29:03 -08:00
Brian Behlendorf 513a41dfbb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-08 11:28:59 -08:00
Brian Behlendorf fa9d127dda Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-08 11:28:59 -08:00
Brian Behlendorf 0c7c3ec401 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-08 11:28:56 -08:00
Brian Behlendorf 14ad273ca7 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-08 11:28:55 -08:00
Brian Behlendorf 794cb62de8 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-08 11:28:52 -08:00
Brian Behlendorf 929737cef6 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-08 11:28:51 -08:00
Brian Behlendorf a1204449dd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-08 11:28:51 -08:00
Brian Behlendorf da0c9f21d5 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-08 11:28:46 -08:00