Brian Behlendorf
|
1397a61615
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:23:17 -08:00 |
|
Brian Behlendorf
|
f19b3228d3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 09:23:16 -08:00 |
|
Brian Behlendorf
|
bdcdafdae1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:23:13 -08:00 |
|
Brian Behlendorf
|
e4f01701a9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 09:23:12 -08:00 |
|
Brian Behlendorf
|
710e7f4528
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:23:09 -08:00 |
|
Brian Behlendorf
|
bc031993d7
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 09:23:08 -08:00 |
|
Brian Behlendorf
|
64765fddf0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:23:04 -08:00 |
|
Brian Behlendorf
|
efbf9637d4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 09:23:03 -08:00 |
|
Brian Behlendorf
|
ee566c662d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:23:00 -08:00 |
|
Brian Behlendorf
|
2ad15bb834
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 09:22:59 -08:00 |
|
Brian Behlendorf
|
6d56b617b0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:56 -08:00 |
|
Brian Behlendorf
|
29d5998baf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 09:22:55 -08:00 |
|
Brian Behlendorf
|
f2dc02c87c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 09:22:55 -08:00 |
|
Brian Behlendorf
|
80135e401b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:50 -08:00 |
|
Brian Behlendorf
|
b643dc493f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 09:22:49 -08:00 |
|
Brian Behlendorf
|
8516e2d45e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 09:22:48 -08:00 |
|
Brian Behlendorf
|
099baa2f4b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:43 -08:00 |
|
Brian Behlendorf
|
fdb922a832
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 09:22:42 -08:00 |
|
Brian Behlendorf
|
f8cb976737
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:39 -08:00 |
|
Brian Behlendorf
|
188c1f3e53
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 09:22:38 -08:00 |
|
Brian Behlendorf
|
280f5146df
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:35 -08:00 |
|
Brian Behlendorf
|
7f2347ed6c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 09:22:34 -08:00 |
|
Brian Behlendorf
|
202379ff1b
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:31 -08:00 |
|
Brian Behlendorf
|
ec1c8e9315
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 09:22:30 -08:00 |
|
Brian Behlendorf
|
0a64a74793
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:27 -08:00 |
|
Brian Behlendorf
|
4da6736d91
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 09:22:26 -08:00 |
|
Brian Behlendorf
|
32414e9d6f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:23 -08:00 |
|
Brian Behlendorf
|
16b2e37739
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 09:22:22 -08:00 |
|
Brian Behlendorf
|
c1a800e4c5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:19 -08:00 |
|
Brian Behlendorf
|
bef9892959
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 09:22:18 -08:00 |
|
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
|
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 |