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
|
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 |
|
Brian Behlendorf
|
addba426c1
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:30 -08:00 |
|
Brian Behlendorf
|
ec06bdd475
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 11:18:29 -08:00 |
|
Brian Behlendorf
|
7166cbe27b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:26 -08:00 |
|
Brian Behlendorf
|
64d5108c1f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 11:18:24 -08:00 |
|
Brian Behlendorf
|
724856bed1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:21 -08:00 |
|
Brian Behlendorf
|
eac7a414e5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 11:18:20 -08:00 |
|
Brian Behlendorf
|
19852c501d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:17 -08:00 |
|
Brian Behlendorf
|
c88b95c373
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 11:18:15 -08:00 |
|
Brian Behlendorf
|
62111b4e9f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:12 -08:00 |
|
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |
|
Brian Behlendorf
|
c89fd4d8e7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:08 -08:00 |
|
Brian Behlendorf
|
47d0dbf5f6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:18:07 -08:00 |
|
Brian Behlendorf
|
d577b2a92d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:18:03 -08:00 |
|
Brian Behlendorf
|
27448c8cdb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:18:02 -08:00 |
|
Brian Behlendorf
|
46d6cd36f5
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:59 -08:00 |
|
Brian Behlendorf
|
2266aeea13
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:17:58 -08:00 |
|
Brian Behlendorf
|
26daaf553f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:17:57 -08:00 |
|
Brian Behlendorf
|
922fcf8240
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:52 -08:00 |
|
Brian Behlendorf
|
5ae105bfd0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 11:17:51 -08:00 |
|
Brian Behlendorf
|
6f2638f7a3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:17:50 -08:00 |
|
Brian Behlendorf
|
1c0fcbc89e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:45 -08:00 |
|
Brian Behlendorf
|
eb0dad6922
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 11:17:44 -08:00 |
|
Brian Behlendorf
|
381cb97b94
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:40 -08:00 |
|
Brian Behlendorf
|
8ce3344d62
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 11:17:39 -08:00 |
|
Brian Behlendorf
|
fcc150dd96
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:36 -08:00 |
|
Brian Behlendorf
|
8fd272bb0f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:17:34 -08:00 |
|
Brian Behlendorf
|
10504a5936
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:31 -08:00 |
|
Brian Behlendorf
|
07d457cedb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 11:17:30 -08:00 |
|
Brian Behlendorf
|
7f94f2a58e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:27 -08:00 |
|
Brian Behlendorf
|
76fbe573f5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 11:17:26 -08:00 |
|
Brian Behlendorf
|
9b17cd6a65
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:22 -08:00 |
|
Brian Behlendorf
|
482758ca0f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 11:17:21 -08:00 |
|
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
|
Brian Behlendorf
|
35c17babae
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 11:14:01 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
1ef609d29e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:45:00 -08:00 |
|
Brian Behlendorf
|
4291b2e02f
|
Add locale.h
|
2008-12-17 10:43:06 -08:00 |