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 |
|
Brian Behlendorf
|
5324a7dcde
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:46 -08:00 |
|
Brian Behlendorf
|
e94cd936de
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 11:27:44 -08:00 |
|
Brian Behlendorf
|
60ff994d87
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:41 -08:00 |
|
Brian Behlendorf
|
4d9ebd310f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 11:27:40 -08:00 |
|
Brian Behlendorf
|
cceb709b6e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:37 -08:00 |
|
Brian Behlendorf
|
d08ac757e3
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 11:27:35 -08:00 |
|
Brian Behlendorf
|
34abfc4379
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:32 -08:00 |
|
Brian Behlendorf
|
4620ac9f31
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 11:27:31 -08:00 |
|
Brian Behlendorf
|
c8fa454480
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:28 -08:00 |
|
Brian Behlendorf
|
1387ebf84c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 11:27:27 -08:00 |
|
Brian Behlendorf
|
561a603c4a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 11:27:26 -08:00 |
|
Brian Behlendorf
|
77c8446f8f
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:21 -08:00 |
|
Brian Behlendorf
|
aa02376a1e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 11:27:20 -08:00 |
|
Brian Behlendorf
|
e669dbace6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 11:27:19 -08:00 |
|
Brian Behlendorf
|
41309bc857
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:14 -08:00 |
|
Brian Behlendorf
|
9eee23314a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-23 11:27:13 -08:00 |
|
Brian Behlendorf
|
4638436729
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:10 -08:00 |
|
Brian Behlendorf
|
cf2a7e4a1c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-23 11:27:09 -08:00 |
|
Brian Behlendorf
|
dbe91f2a79
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:06 -08:00 |
|
Brian Behlendorf
|
8ff7fb184f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-23 11:27:04 -08:00 |
|
Brian Behlendorf
|
887aa7d831
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:27:01 -08:00 |
|
Brian Behlendorf
|
6fcde8f956
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 11:27:00 -08:00 |
|
Brian Behlendorf
|
9eecd3f5e6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:26:57 -08:00 |
|
Brian Behlendorf
|
c77797d3a3
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 11:26:55 -08:00 |
|
Brian Behlendorf
|
a161190ad1
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:26:52 -08:00 |
|
Brian Behlendorf
|
091dbe8335
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-23 11:26:51 -08:00 |
|
Brian Behlendorf
|
e7f149a03c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:26:48 -08:00 |
|
Brian Behlendorf
|
562b275a1c
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-23 11:26:46 -08:00 |
|
Brian Behlendorf
|
8c549cdfd6
|
Add MODDIR directory
|
2008-12-23 11:06:08 -08:00 |
|
Brian Behlendorf
|
4be41fa96f
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 10:19:54 -08:00 |
|
Brian Behlendorf
|
a7dade2116
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 10:19:53 -08:00 |
|
Brian Behlendorf
|
688b002fbd
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-23 10:19:50 -08:00 |
|
Brian Behlendorf
|
0c8bfb835e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-23 10:19:48 -08:00 |
|
Brian Behlendorf
|
1ef314d53f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 10:19:45 -08:00 |
|
Brian Behlendorf
|
ff046c4099
|
Resolve conflict
|
2008-12-23 10:19:41 -08:00 |
|
Brian Behlendorf
|
4081855586
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 10:18:59 -08:00 |
|
Brian Behlendorf
|
34e0918846
|
Resolve conflict
|
2008-12-23 10:18:54 -08:00 |