Commit Graph

4425 Commits

Author SHA1 Message Date
Brian Behlendorf 8dded7d40f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-08 10:20:10 -08:00
Brian Behlendorf fde2956795 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-08 10:20:09 -08:00
Brian Behlendorf f9c8264ee6 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-08 10:20:06 -08:00
Brian Behlendorf 1064035639 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-08 10:20:06 -08:00
Brian Behlendorf 4a689eed9b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 10:20:03 -08:00
Brian Behlendorf 9536bf0660 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-08 10:20:02 -08:00
Brian Behlendorf 85f71237d9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 10:20:01 -08:00
Brian Behlendorf 35c322451f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 10:20:00 -08:00
Brian Behlendorf 4c7ed56833 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-08 10:20:00 -08:00
Brian Behlendorf 5cf55d35dd Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-08 10:20:00 -08:00
Brian Behlendorf fd39fc67d0 Fix invalid %llf format by dropping useless ll prefix 2008-12-08 10:18:11 -08:00
Brian Behlendorf 7501f3ed9f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 10:13:13 -08:00
Brian Behlendorf 992d1b1e17 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 10:13:12 -08:00
Brian Behlendorf df0137dfc9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-08 10:13:09 -08:00
Brian Behlendorf 81fb3fc03f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-08 10:13:08 -08:00
Brian Behlendorf bef7e51d9c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-08 10:13:05 -08:00
Brian Behlendorf 627d2deab9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-08 10:13:04 -08:00
Brian Behlendorf 6fdb532917 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-08 10:13:01 -08:00
Brian Behlendorf 62af2cf8c4 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-08 10:13:01 -08:00
Brian Behlendorf 706184dd17 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-08 10:12:57 -08:00
Brian Behlendorf 06757c0933 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:57 -08:00
Brian Behlendorf 8a2165ddcc Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:54 -08:00
Brian Behlendorf 63a8a5ca44 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-08 10:12:53 -08:00
Brian Behlendorf cd4ec0a708 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:50 -08:00
Brian Behlendorf 3d81c63cbd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-08 10:12:49 -08:00
Brian Behlendorf 221c82ffeb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-08 10:12:46 -08:00
Brian Behlendorf e626662a4e Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:46 -08:00
Brian Behlendorf 566ad1b808 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-08 10:12:42 -08:00
Brian Behlendorf d529d4e450 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:42 -08:00
Brian Behlendorf a4f5db62aa Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:39 -08:00
Brian Behlendorf 85009f4e59 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-08 10:12:38 -08:00
Brian Behlendorf 5dc0f37f61 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-08 10:12:35 -08:00
Brian Behlendorf b11e5e30c4 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:35 -08:00
Brian Behlendorf 8a63bdf4eb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-08 10:12:34 -08:00
Brian Behlendorf e7109c4ea8 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:29 -08:00
Brian Behlendorf 1565b6f085 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-08 10:12:28 -08:00
Brian Behlendorf 748ee8452c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-08 10:12:28 -08:00
Brian Behlendorf 93b7ec3c7a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:23 -08:00
Brian Behlendorf 7881ea4624 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-08 10:12:22 -08:00
Brian Behlendorf ea27414f3c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:19 -08:00
Brian Behlendorf 1de3c95cf7 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-08 10:12:18 -08:00
Brian Behlendorf 38a601674f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:15 -08:00
Brian Behlendorf 623e08dff2 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-08 10:12:14 -08:00
Brian Behlendorf 5080757452 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 10:12:11 -08:00
Brian Behlendorf ef319de444 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:11 -08:00
Brian Behlendorf ff9dc08932 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:08 -08:00
Brian Behlendorf 00ecc7d3e5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-08 10:12:07 -08:00
Brian Behlendorf f9625109ab Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:04 -08:00
Brian Behlendorf 387ef21ab6 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-08 10:12:03 -08:00
Brian Behlendorf 61e6f92381 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 10:12:00 -08:00