Brian Behlendorf
|
b9fe30002e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 13:03:57 -08:00 |
|
Brian Behlendorf
|
fcd7d860e6
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 13:03:56 -08:00 |
|
Brian Behlendorf
|
e41d37c49d
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 13:03:56 -08:00 |
|
Brian Behlendorf
|
fafeacb53f
|
Resolve shadow conflict
|
2008-12-17 13:01:56 -08:00 |
|
Brian Behlendorf
|
a5313a4d26
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:50 -08:00 |
|
Brian Behlendorf
|
796cfc5ec8
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 12:48:46 -08:00 |
|
Brian Behlendorf
|
46953c27af
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:40 -08:00 |
|
Brian Behlendorf
|
95563901d4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 12:48:38 -08:00 |
|
Brian Behlendorf
|
493b25baa4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:31 -08:00 |
|
Brian Behlendorf
|
ee81d0b874
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 12:48:28 -08:00 |
|
Brian Behlendorf
|
11bd1531a1
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:23 -08:00 |
|
Brian Behlendorf
|
50a0e5a270
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 12:48:21 -08:00 |
|
Brian Behlendorf
|
52d8216e19
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:15 -08:00 |
|
Brian Behlendorf
|
f802338b3c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:48:12 -08:00 |
|
Brian Behlendorf
|
d0db1bb3f3
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:06 -08:00 |
|
Brian Behlendorf
|
4f058c3035
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 12:48:03 -08:00 |
|
Brian Behlendorf
|
a3b3bb718d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:57 -08:00 |
|
Brian Behlendorf
|
f94ea35011
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 12:47:55 -08:00 |
|
Brian Behlendorf
|
8e80ef3802
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:50 -08:00 |
|
Brian Behlendorf
|
ad58c411bc
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 12:47:47 -08:00 |
|
Brian Behlendorf
|
2002368d3e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:41 -08:00 |
|
Brian Behlendorf
|
12129fde0e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 12:47:37 -08:00 |
|
Brian Behlendorf
|
7a41e78325
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:30 -08:00 |
|
Brian Behlendorf
|
d2ce2661bb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 12:47:27 -08:00 |
|
Brian Behlendorf
|
feee6b1f71
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:22 -08:00 |
|
Brian Behlendorf
|
4ca4b6567c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 12:47:20 -08:00 |
|
Brian Behlendorf
|
eb1f11096c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:14 -08:00 |
|
Brian Behlendorf
|
945cf1f5db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:47:12 -08:00 |
|
Brian Behlendorf
|
65a8241291
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:47:11 -08:00 |
|
Brian Behlendorf
|
1fdd046156
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:47:03 -08:00 |
|
Brian Behlendorf
|
e56be59f06
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 12:46:59 -08:00 |
|
Brian Behlendorf
|
137b3bb57d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 12:46:57 -08:00 |
|
Brian Behlendorf
|
cc7bf725e7
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:49 -08:00 |
|
Brian Behlendorf
|
e01f880071
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 12:46:45 -08:00 |
|
Brian Behlendorf
|
dab5796f27
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:39 -08:00 |
|
Brian Behlendorf
|
4c83b9710c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 12:46:36 -08:00 |
|
Brian Behlendorf
|
fceb9d1c64
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:31 -08:00 |
|
Brian Behlendorf
|
99c1ff8db4
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 12:46:27 -08:00 |
|
Brian Behlendorf
|
82d07f943d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:21 -08:00 |
|
Brian Behlendorf
|
e9df2caecb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 12:46:18 -08:00 |
|
Brian Behlendorf
|
9f9c5b9fdc
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:13 -08:00 |
|
Brian Behlendorf
|
c0fc33250f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 12:46:10 -08:00 |
|
Brian Behlendorf
|
b4bb859c44
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:46:05 -08:00 |
|
Brian Behlendorf
|
87d576b197
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 12:46:03 -08:00 |
|
Brian Behlendorf
|
1153d7e9da
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:45:58 -08:00 |
|
Brian Behlendorf
|
68f872e15b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 12:45:55 -08:00 |
|
Brian Behlendorf
|
863ec76ff7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:45:53 -08:00 |
|
Brian Behlendorf
|
941e464645
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:45:52 -08:00 |
|
Brian Behlendorf
|
54587036c1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
a1b865abee
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 12:45:51 -08:00 |