Brian Behlendorf
|
c40927ff1f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 17:04:29 -08:00 |
|
Brian Behlendorf
|
465d24ffd1
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:04:22 -08:00 |
|
Brian Behlendorf
|
adf685a7bd
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 17:04:18 -08:00 |
|
Brian Behlendorf
|
62c0270cb0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:04:11 -08:00 |
|
Brian Behlendorf
|
ed3846d90c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 17:04:08 -08:00 |
|
Brian Behlendorf
|
b518ce3bf7
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:04:04 -08:00 |
|
Brian Behlendorf
|
a836fda189
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 17:04:00 -08:00 |
|
Brian Behlendorf
|
26be215540
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:55 -08:00 |
|
Brian Behlendorf
|
19d692bf68
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 17:03:52 -08:00 |
|
Brian Behlendorf
|
77d183cde9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:45 -08:00 |
|
Brian Behlendorf
|
d15e32bbd2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 17:03:42 -08:00 |
|
Brian Behlendorf
|
e38c4a1b6f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:35 -08:00 |
|
Brian Behlendorf
|
585fd3e1e9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 17:03:33 -08:00 |
|
Brian Behlendorf
|
3e0aa78e4e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:28 -08:00 |
|
Brian Behlendorf
|
a2cbba5d19
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 17:03:24 -08:00 |
|
Brian Behlendorf
|
48fc1eb58f
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:17 -08:00 |
|
Brian Behlendorf
|
b92fd0664c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 17:03:13 -08:00 |
|
Brian Behlendorf
|
13c53b8d9a
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:03:07 -08:00 |
|
Brian Behlendorf
|
093c1bbe0e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 17:03:03 -08:00 |
|
Brian Behlendorf
|
febace6747
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:02:57 -08:00 |
|
Brian Behlendorf
|
62d4525a1c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 17:02:53 -08:00 |
|
Brian Behlendorf
|
b311e10c5c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 17:02:51 -08:00 |
|
Brian Behlendorf
|
e0d24e84af
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:02:40 -08:00 |
|
Brian Behlendorf
|
4b94ff958a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 17:02:36 -08:00 |
|
Brian Behlendorf
|
511af80b44
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 17:02:34 -08:00 |
|
Brian Behlendorf
|
649487f74c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:02:22 -08:00 |
|
Brian Behlendorf
|
3d5bf779a3
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 17:02:18 -08:00 |
|
Brian Behlendorf
|
6c400d6edb
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:02:11 -08:00 |
|
Brian Behlendorf
|
2389c88beb
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 17:02:07 -08:00 |
|
Brian Behlendorf
|
21c21245df
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:02:00 -08:00 |
|
Brian Behlendorf
|
93b3cd21aa
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 17:01:56 -08:00 |
|
Brian Behlendorf
|
8610e1a2bc
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:49 -08:00 |
|
Brian Behlendorf
|
f797489fb9
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 17:01:44 -08:00 |
|
Brian Behlendorf
|
dc421e4268
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:39 -08:00 |
|
Brian Behlendorf
|
2044c4bfd1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 17:01:36 -08:00 |
|
Brian Behlendorf
|
9e04caa7ab
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:31 -08:00 |
|
Brian Behlendorf
|
6fcd70e073
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 17:01:27 -08:00 |
|
Brian Behlendorf
|
93e36c1f27
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:22 -08:00 |
|
Brian Behlendorf
|
ab512fae44
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 17:01:15 -08:00 |
|
Brian Behlendorf
|
53e66eef5a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 17:01:14 -08:00 |
|
Brian Behlendorf
|
6e26929ddf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 17:01:12 -08:00 |
|
Brian Behlendorf
|
206825be85
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 17:01:10 -08:00 |
|
Brian Behlendorf
|
420137d529
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 17:01:09 -08:00 |
|
Brian Behlendorf
|
194244b80b
|
Resolve read shadow conflict
|
2008-12-17 16:57:21 -08:00 |
|
Brian Behlendorf
|
6a1e1ed1d6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:29 -08:00 |
|
Brian Behlendorf
|
f4d63a4cd4
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 16:47:26 -08:00 |
|
Brian Behlendorf
|
c969ed69c3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:19 -08:00 |
|
Brian Behlendorf
|
c90836a39f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 16:47:17 -08:00 |
|
Brian Behlendorf
|
677a057c0c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:11 -08:00 |
|
Brian Behlendorf
|
f7f62a41ad
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 16:47:08 -08:00 |