Brian Behlendorf
|
29550399c6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-23 11:50:38 -08:00 |
|
Brian Behlendorf
|
6ef86a4fc6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:35 -08:00 |
|
Brian Behlendorf
|
6b2ced4447
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 11:50:33 -08:00 |
|
Brian Behlendorf
|
6bd369001e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:30 -08:00 |
|
Brian Behlendorf
|
6020c512e5
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-23 11:50:29 -08:00 |
|
Brian Behlendorf
|
52d613e4b1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:25 -08:00 |
|
Brian Behlendorf
|
67d2cff1ac
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 11:50:24 -08:00 |
|
Brian Behlendorf
|
40a1f6b444
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:21 -08:00 |
|
Brian Behlendorf
|
4f98a245f4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 11:50:19 -08:00 |
|
Brian Behlendorf
|
680d4c1618
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:16 -08:00 |
|
Brian Behlendorf
|
5fe9881ef0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 11:50:15 -08:00 |
|
Brian Behlendorf
|
4125870825
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:12 -08:00 |
|
Brian Behlendorf
|
7c6d905ec3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 11:50:11 -08:00 |
|
Brian Behlendorf
|
9e620a29e9
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:07 -08:00 |
|
Brian Behlendorf
|
1431c8e452
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 11:50:06 -08:00 |
|
Brian Behlendorf
|
8209bef3af
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 11:50:05 -08:00 |
|
Brian Behlendorf
|
7c593a896e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:50:00 -08:00 |
|
Brian Behlendorf
|
ce950dd29f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 11:49:59 -08:00 |
|
Brian Behlendorf
|
82cd3659a2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 11:49:58 -08:00 |
|
Brian Behlendorf
|
72f63ab007
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:53 -08:00 |
|
Brian Behlendorf
|
ee22804ba5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-23 11:49:52 -08:00 |
|
Brian Behlendorf
|
797f9d2b55
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:49 -08:00 |
|
Brian Behlendorf
|
20569b9dd3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-23 11:49:47 -08:00 |
|
Brian Behlendorf
|
a467fd142d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:44 -08:00 |
|
Brian Behlendorf
|
69842cbd88
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-23 11:49:43 -08:00 |
|
Brian Behlendorf
|
d7ccc95618
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:40 -08:00 |
|
Brian Behlendorf
|
b9d6c4c329
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 11:49:39 -08:00 |
|
Brian Behlendorf
|
a29296649c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:35 -08:00 |
|
Brian Behlendorf
|
de2b1e9189
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 11:49:34 -08:00 |
|
Brian Behlendorf
|
95b055ffda
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:31 -08:00 |
|
Brian Behlendorf
|
a9f6ed7ef9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-23 11:49:30 -08:00 |
|
Brian Behlendorf
|
c95e9a8ce0
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:27 -08:00 |
|
Brian Behlendorf
|
5e435489ae
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-23 11:49:25 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
2bfda1a2a7
|
Resolve conflict
|
2008-12-23 11:45:24 -08:00 |
|
Brian Behlendorf
|
7e10a5b195
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-23 11:28:17 -08:00 |
|
Brian Behlendorf
|
12b5fc3226
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:28:16 -08:00 |
|
Brian Behlendorf
|
a305a0bfa9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 11:28:15 -08:00 |
|
Brian Behlendorf
|
179f09697a
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:28:12 -08:00 |
|
Brian Behlendorf
|
d1ad7cb7c1
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-23 11:28:11 -08:00 |
|
Brian Behlendorf
|
a4f5d1d1db
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:28:08 -08:00 |
|
Brian Behlendorf
|
4d2e29f489
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-23 11:28:07 -08:00 |
|
Brian Behlendorf
|
464ec969f5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:28:03 -08:00 |
|
Brian Behlendorf
|
e86bf7454b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 11:28:02 -08:00 |
|
Brian Behlendorf
|
608fab3393
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:59 -08:00 |
|
Brian Behlendorf
|
a9c2994275
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-23 11:27:58 -08:00 |
|
Brian Behlendorf
|
9ad594ffe9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:54 -08:00 |
|
Brian Behlendorf
|
ad95c489e5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 11:27:53 -08:00 |
|
Brian Behlendorf
|
7a3cb0d42f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:50 -08:00 |
|
Brian Behlendorf
|
ae0a510100
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-23 11:27:49 -08:00 |