Brian Behlendorf
|
47401c9853
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-06-08 12:24:41 -07:00 |
|
Brian Behlendorf
|
0475754226
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:24:19 -07:00 |
|
Brian Behlendorf
|
11627ff1b9
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-06-08 12:24:14 -07:00 |
|
Brian Behlendorf
|
8221bf2d06
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:23:52 -07:00 |
|
Brian Behlendorf
|
4eb42caf81
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-06-08 12:23:48 -07:00 |
|
Brian Behlendorf
|
2387afbe2c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:23:21 -07:00 |
|
Brian Behlendorf
|
1256ffae8d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-06-08 12:23:16 -07:00 |
|
Brian Behlendorf
|
e0d94e038b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:22:51 -07:00 |
|
Brian Behlendorf
|
e94e028bdb
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-06-08 12:22:46 -07:00 |
|
Brian Behlendorf
|
212c3cc578
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:22:26 -07:00 |
|
Brian Behlendorf
|
46fd13bc13
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-06-08 12:22:20 -07:00 |
|
Brian Behlendorf
|
e3bf15ec1a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:21:59 -07:00 |
|
Brian Behlendorf
|
03596fda14
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-06-08 12:21:55 -07:00 |
|
Brian Behlendorf
|
544e2be051
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:21:31 -07:00 |
|
Brian Behlendorf
|
3905f57070
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-06-08 12:21:27 -07:00 |
|
Brian Behlendorf
|
7412500675
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:21:02 -07:00 |
|
Brian Behlendorf
|
fb01b03e27
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-06-08 12:20:57 -07:00 |
|
Brian Behlendorf
|
3034a27303
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:20:38 -07:00 |
|
Brian Behlendorf
|
383454e16d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-06-08 12:20:33 -07:00 |
|
Brian Behlendorf
|
b9a3f49898
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:20:12 -07:00 |
|
Brian Behlendorf
|
80ded7f6a2
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-06-08 12:20:07 -07:00 |
|
Brian Behlendorf
|
fcc24de42b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-06-08 12:20:05 -07:00 |
|
Brian Behlendorf
|
08fc3a51c1
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:19:27 -07:00 |
|
Brian Behlendorf
|
8d0295158c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-06-08 12:19:23 -07:00 |
|
Brian Behlendorf
|
cc652f2c35
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-06-08 12:19:20 -07:00 |
|
Brian Behlendorf
|
5cce14d760
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:18:35 -07:00 |
|
Brian Behlendorf
|
52fc393443
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-06-08 12:18:28 -07:00 |
|
Brian Behlendorf
|
68475ebd7a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:18:07 -07:00 |
|
Brian Behlendorf
|
9823df1da3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-06-08 12:18:03 -07:00 |
|
Brian Behlendorf
|
a2346901df
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:17:43 -07:00 |
|
Brian Behlendorf
|
4e9edefae9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-06-08 12:17:38 -07:00 |
|
Brian Behlendorf
|
146aef7804
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:17:18 -07:00 |
|
Brian Behlendorf
|
4d4aad098e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-06-08 12:17:13 -07:00 |
|
Brian Behlendorf
|
6b95247b64
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:16:53 -07:00 |
|
Brian Behlendorf
|
e062ad297d
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-06-08 12:16:48 -07:00 |
|
Brian Behlendorf
|
cebec45d9d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:16:28 -07:00 |
|
Brian Behlendorf
|
bec1229563
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-06-08 12:16:22 -07:00 |
|
Brian Behlendorf
|
2b86ff39b7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-06-08 12:15:56 -07:00 |
|
Brian Behlendorf
|
2c77c8948f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-06-08 12:15:51 -07:00 |
|
Brian Behlendorf
|
4253416b7d
|
Refresh for consistency with COPYRIGHT
|
2009-06-08 11:59:13 -07:00 |
|
Brian Behlendorf
|
1b3e40ab94
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-06-08 11:28:36 -07:00 |
|
Brian Behlendorf
|
ad64f68552
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:28:34 -07:00 |
|
Brian Behlendorf
|
e92ce3e75e
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-06-08 11:28:29 -07:00 |
|
Brian Behlendorf
|
1e27cd9a0b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:28:09 -07:00 |
|
Brian Behlendorf
|
7a92348c6f
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-06-08 11:28:05 -07:00 |
|
Brian Behlendorf
|
7807622204
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:27:40 -07:00 |
|
Brian Behlendorf
|
8ddca9fded
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-06-08 11:27:36 -07:00 |
|
Brian Behlendorf
|
14eac5c102
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:27:13 -07:00 |
|
Brian Behlendorf
|
aaba7f070a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-06-08 11:27:10 -07:00 |
|
Brian Behlendorf
|
6029ecc487
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:26:44 -07:00 |