Commit Graph

5866 Commits

Author SHA1 Message Date
Brian Behlendorf 965e8927a6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:49 -08:00
Brian Behlendorf 3e9b418237 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 10:37:48 -08:00
Brian Behlendorf 68d139599c Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:44 -08:00
Brian Behlendorf a86514b954 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 10:37:43 -08:00
Brian Behlendorf 9882eaa4f1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:40 -08:00
Brian Behlendorf 99a90ee606 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 10:37:39 -08:00
Brian Behlendorf eb5dc41504 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:36 -08:00
Brian Behlendorf dcd93a91a5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:37:35 -08:00
Brian Behlendorf a14a1cd92e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:32 -08:00
Brian Behlendorf 023d652154 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 10:37:31 -08:00
Brian Behlendorf 8e44278f93 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:28 -08:00
Brian Behlendorf 380a9bcd88 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 10:37:26 -08:00
Brian Behlendorf 819fbb564f Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:23 -08:00
Brian Behlendorf 32d62a53f4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 10:37:22 -08:00
Brian Behlendorf 388566f2f9 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:19 -08:00
Brian Behlendorf b390664792 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:37:18 -08:00
Brian Behlendorf 1b58b35d1b Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:15 -08:00
Brian Behlendorf 7532b57352 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:37:14 -08:00
Brian Behlendorf fd01bfe6b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:37:13 -08:00
Brian Behlendorf 6509acc1dc Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:08 -08:00
Brian Behlendorf afacc36f29 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 10:37:07 -08:00
Brian Behlendorf 01f8dc1f20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:37:06 -08:00
Brian Behlendorf 93b6cc33bf Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 10:37:01 -08:00
Brian Behlendorf 809a867d29 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 10:37:00 -08:00
Brian Behlendorf 97a9f70728 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:57 -08:00
Brian Behlendorf 7abf21e6da Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 10:36:56 -08:00
Brian Behlendorf 622cf33b28 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:53 -08:00
Brian Behlendorf 7cfeada0bb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 10:36:51 -08:00
Brian Behlendorf cfada10dff Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:48 -08:00
Brian Behlendorf 902d7561e5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 10:36:47 -08:00
Brian Behlendorf c17203401a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:44 -08:00
Brian Behlendorf 1c1fa92ef6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 10:36:43 -08:00
Brian Behlendorf b309fdf7a7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:40 -08:00
Brian Behlendorf 338d788e1c Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 10:36:39 -08:00
Brian Behlendorf b6865ac44a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 10:36:36 -08:00
Brian Behlendorf ec5a044391 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 10:36:34 -08:00
Brian Behlendorf 76247cc21d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:36:34 -08:00
Brian Behlendorf 800463b2ef Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf d9cd04fc35 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf 7e159c86a3 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:36:32 -08:00
Brian Behlendorf 294ebb7537 Fix C90 for(int i;;;) compliance issues 2008-12-19 10:34:41 -08:00
Brian Behlendorf 74bbeffcc7 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 10:27:44 -08:00
Brian Behlendorf b1f73ca6ac Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 10:27:43 -08:00
Brian Behlendorf cfd9182e04 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:27:40 -08:00
Brian Behlendorf a4c497f134 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 10:27:39 -08:00
Brian Behlendorf dfb8818330 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 10:27:36 -08:00
Brian Behlendorf eeb4e47031 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 10:27:35 -08:00
Brian Behlendorf ef84cfd7f2 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 10:27:32 -08:00
Brian Behlendorf 06528b7d6e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 10:27:31 -08:00
Brian Behlendorf a7bef81524 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 10:27:28 -08:00