Brian Behlendorf
|
fe0cad8ba9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:59:38 -08:00 |
|
Brian Behlendorf
|
bc1ce928f6
|
Add makefiles
|
2008-12-12 08:57:54 -08:00 |
|
Brian Behlendorf
|
8f3f72b821
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:33 -08:00 |
|
Brian Behlendorf
|
85e026f310
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 08:53:32 -08:00 |
|
Brian Behlendorf
|
7578aca1b4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:29 -08:00 |
|
Brian Behlendorf
|
9752c0ae90
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 08:53:28 -08:00 |
|
Brian Behlendorf
|
fc5322e134
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:25 -08:00 |
|
Brian Behlendorf
|
06c36a4115
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 08:53:24 -08:00 |
|
Brian Behlendorf
|
20ec672e4f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:20 -08:00 |
|
Brian Behlendorf
|
3be55bb45e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 08:53:19 -08:00 |
|
Brian Behlendorf
|
0db961cc3b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:16 -08:00 |
|
Brian Behlendorf
|
880830053c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 08:53:15 -08:00 |
|
Brian Behlendorf
|
70bc9aeddc
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:12 -08:00 |
|
Brian Behlendorf
|
72ff1d0707
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 08:53:11 -08:00 |
|
Brian Behlendorf
|
7c690f258a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:08 -08:00 |
|
Brian Behlendorf
|
999bdbb6ac
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 08:53:07 -08:00 |
|
Brian Behlendorf
|
32da84c6a7
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:53:04 -08:00 |
|
Brian Behlendorf
|
370d47306c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 08:53:03 -08:00 |
|
Brian Behlendorf
|
7d28965c9c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:59 -08:00 |
|
Brian Behlendorf
|
c87484ff9a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 08:52:58 -08:00 |
|
Brian Behlendorf
|
994c91ec00
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:55 -08:00 |
|
Brian Behlendorf
|
5522b00069
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 08:52:54 -08:00 |
|
Brian Behlendorf
|
2a2b1a08a7
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:51 -08:00 |
|
Brian Behlendorf
|
20e4845d0f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 08:52:50 -08:00 |
|
Brian Behlendorf
|
87b4b8b8b7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 08:52:49 -08:00 |
|
Brian Behlendorf
|
fef97db610
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 08:52:44 -08:00 |
|
Brian Behlendorf
|
0632ea7519
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:44 -08:00 |
|
Brian Behlendorf
|
86b3bb18c3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 08:52:43 -08:00 |
|
Brian Behlendorf
|
68f1b9897a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:38 -08:00 |
|
Brian Behlendorf
|
6955ffc56e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 08:52:37 -08:00 |
|
Brian Behlendorf
|
da8fab1481
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:33 -08:00 |
|
Brian Behlendorf
|
d8ce35e47b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 08:52:32 -08:00 |
|
Brian Behlendorf
|
48ba9339c0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:29 -08:00 |
|
Brian Behlendorf
|
579ce8f9b7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 08:52:28 -08:00 |
|
Brian Behlendorf
|
fc82e794ef
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:25 -08:00 |
|
Brian Behlendorf
|
690e4461e6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 08:52:24 -08:00 |
|
Brian Behlendorf
|
8afe144546
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:21 -08:00 |
|
Brian Behlendorf
|
b718b79b37
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 08:52:20 -08:00 |
|
Brian Behlendorf
|
8168534188
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:17 -08:00 |
|
Brian Behlendorf
|
61ddb2540c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 08:52:16 -08:00 |
|
Brian Behlendorf
|
9e66117d33
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:13 -08:00 |
|
Brian Behlendorf
|
4b23ec8daa
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 08:52:11 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
db2a32417f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:36 -08:00 |
|
Brian Behlendorf
|
ceca9a6705
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 16:57:34 -08:00 |
|
Brian Behlendorf
|
71d07a58ca
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:27 -08:00 |
|
Brian Behlendorf
|
4b674271a9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 16:57:25 -08:00 |
|
Brian Behlendorf
|
3861c10c9b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:18 -08:00 |
|
Brian Behlendorf
|
894cf1fb8e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 16:57:16 -08:00 |
|
Brian Behlendorf
|
513a4d1cf9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:10 -08:00 |