Brian Behlendorf
|
f6c27d63b0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:39 -08:00 |
|
Brian Behlendorf
|
100e5ebb03
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:28:37 -08:00 |
|
Brian Behlendorf
|
51764d4771
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:34 -08:00 |
|
Brian Behlendorf
|
4594f16eb4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 11:28:33 -08:00 |
|
Brian Behlendorf
|
745ddac088
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:30 -08:00 |
|
Brian Behlendorf
|
84cf167e93
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 11:28:29 -08:00 |
|
Brian Behlendorf
|
db0417ce30
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:26 -08:00 |
|
Brian Behlendorf
|
511a49265a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 11:28:24 -08:00 |
|
Brian Behlendorf
|
33b07313fc
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:21 -08:00 |
|
Brian Behlendorf
|
d07031a3a9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 11:28:20 -08:00 |
|
Brian Behlendorf
|
5e55b9f4bc
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:17 -08:00 |
|
Brian Behlendorf
|
199eaf1874
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:28:16 -08:00 |
|
Brian Behlendorf
|
397ba3d401
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:12 -08:00 |
|
Brian Behlendorf
|
2ad946619e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:28:11 -08:00 |
|
Brian Behlendorf
|
bbb9f388db
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:08 -08:00 |
|
Brian Behlendorf
|
44f4c483bc
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:28:07 -08:00 |
|
Brian Behlendorf
|
5b8195ad01
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:04 -08:00 |
|
Brian Behlendorf
|
45ae430ddb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:28:03 -08:00 |
|
Brian Behlendorf
|
7927895d37
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:28:02 -08:00 |
|
Brian Behlendorf
|
6c9f801be6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:57 -08:00 |
|
Brian Behlendorf
|
d4c990473f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
5cbfff3589
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
818d313462
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:49 -08:00 |
|
Brian Behlendorf
|
18d71f8999
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 11:27:48 -08:00 |
|
Brian Behlendorf
|
7b5e69962e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:45 -08:00 |
|
Brian Behlendorf
|
0d92189fb6
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 11:27:44 -08:00 |
|
Brian Behlendorf
|
a4c0a907b2
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:41 -08:00 |
|
Brian Behlendorf
|
a4b3bb43a9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:27:40 -08:00 |
|
Brian Behlendorf
|
8bcb53c907
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:36 -08:00 |
|
Brian Behlendorf
|
f56fdd96d3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 11:27:35 -08:00 |
|
Brian Behlendorf
|
3408793f60
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:32 -08:00 |
|
Brian Behlendorf
|
2a15cb4bec
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 11:27:31 -08:00 |
|
Brian Behlendorf
|
295369ef24
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:27 -08:00 |
|
Brian Behlendorf
|
7827c5b51e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 11:27:26 -08:00 |
|
Brian Behlendorf
|
01e5ef8ebe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:23 -08:00 |
|
Brian Behlendorf
|
2bdb04fc14
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 11:27:22 -08:00 |
|
Brian Behlendorf
|
25db7e9413
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:27:21 -08:00 |
|
Brian Behlendorf
|
935fd6c681
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
d0e6950dd1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
55c8582174
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:27:19 -08:00 |
|
Brian Behlendorf
|
dcf0fb9ffb
|
Resolve shadow conflicts
|
2008-12-17 11:25:21 -08:00 |
|
Brian Behlendorf
|
55baefe78a
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 11:19:29 -08:00 |
|
Brian Behlendorf
|
7227f32e5c
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:19:28 -08:00 |
|
Brian Behlendorf
|
aece384623
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 11:19:26 -08:00 |
|
Brian Behlendorf
|
7f5971ccbc
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:19:23 -08:00 |
|
Brian Behlendorf
|
e5191c5ed5
|
Resolve conflict
|
2008-12-17 11:19:19 -08:00 |
|
Brian Behlendorf
|
d65c8326d9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:39 -08:00 |
|
Brian Behlendorf
|
48dc6c7881
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 11:18:38 -08:00 |
|
Brian Behlendorf
|
dce204a26a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:34 -08:00 |
|
Brian Behlendorf
|
a2b11e4955
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:18:33 -08:00 |