Brian Behlendorf
|
b07fcec93b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 14:41:07 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
124d182c51
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:27:05 -08:00 |
|
Brian Behlendorf
|
d7604f31b3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:27:04 -08:00 |
|
Brian Behlendorf
|
f059b96b73
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:27:00 -08:00 |
|
Brian Behlendorf
|
099cf52158
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:26:59 -08:00 |
|
Brian Behlendorf
|
bcddbf21b5
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:56 -08:00 |
|
Brian Behlendorf
|
7a2368eb9a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 14:26:55 -08:00 |
|
Brian Behlendorf
|
b9ef924a3d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:51 -08:00 |
|
Brian Behlendorf
|
af32dabb87
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-09 14:26:50 -08:00 |
|
Brian Behlendorf
|
c68d1dc001
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:47 -08:00 |
|
Brian Behlendorf
|
edf22bf24e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-09 14:26:46 -08:00 |
|
Brian Behlendorf
|
c4c823dfb9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:43 -08:00 |
|
Brian Behlendorf
|
eb60086bb8
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-09 14:26:41 -08:00 |
|
Brian Behlendorf
|
b934c3ddaf
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:38 -08:00 |
|
Brian Behlendorf
|
47c4d4df41
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 14:26:37 -08:00 |
|
Brian Behlendorf
|
8c982d23a8
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:34 -08:00 |
|
Brian Behlendorf
|
c65e95589b
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-09 14:26:32 -08:00 |
|
Brian Behlendorf
|
ab452f5cde
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:29 -08:00 |
|
Brian Behlendorf
|
7f5f5e09b6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-09 14:26:28 -08:00 |
|
Brian Behlendorf
|
517fe7b0d9
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:25 -08:00 |
|
Brian Behlendorf
|
2606b761ac
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-09 14:26:24 -08:00 |
|
Brian Behlendorf
|
5448fd461b
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:20 -08:00 |
|
Brian Behlendorf
|
88129007d4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:26:19 -08:00 |
|
Brian Behlendorf
|
16696784ca
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:26:19 -08:00 |
|
Brian Behlendorf
|
409df08c7d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:13 -08:00 |
|
Brian Behlendorf
|
688fc27b3e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-09 14:26:12 -08:00 |
|
Brian Behlendorf
|
68b2db0a48
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:26:11 -08:00 |
|
Brian Behlendorf
|
6ccf01cb9e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:06 -08:00 |
|
Brian Behlendorf
|
f4f9582bd5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:26:05 -08:00 |
|
Brian Behlendorf
|
6ef9f2ce4d
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:26:01 -08:00 |
|
Brian Behlendorf
|
2be57d6972
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 14:26:00 -08:00 |
|
Brian Behlendorf
|
6538a0c77b
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:25:57 -08:00 |
|
Brian Behlendorf
|
2fa0b0e004
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 14:25:56 -08:00 |
|
Brian Behlendorf
|
47f557fc0d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:25:53 -08:00 |
|
Brian Behlendorf
|
f06b5c462e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:25:51 -08:00 |
|
Brian Behlendorf
|
2bd94158b8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:25:48 -08:00 |
|
Brian Behlendorf
|
07c9e2124a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-09 14:25:47 -08:00 |
|
Brian Behlendorf
|
a6d63a9046
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:25:44 -08:00 |
|
Brian Behlendorf
|
0da210d60e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-09 14:25:43 -08:00 |
|
Brian Behlendorf
|
457fab8a49
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:25:39 -08:00 |
|
Brian Behlendorf
|
eccde17fad
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 14:25:38 -08:00 |
|
Brian Behlendorf
|
7489df5960
|
Refresh Makefiles for new files
|
2008-12-09 14:23:45 -08:00 |
|
Brian Behlendorf
|
eea20f7193
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:18:09 -08:00 |
|
Brian Behlendorf
|
5328928778
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:18:08 -08:00 |
|
Brian Behlendorf
|
641d76d091
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:18:05 -08:00 |
|
Brian Behlendorf
|
e66e190783
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:18:03 -08:00 |
|
Brian Behlendorf
|
88ffe839ff
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:18:00 -08:00 |
|
Brian Behlendorf
|
c4691c4d65
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 14:17:59 -08:00 |
|
Brian Behlendorf
|
4aa24d55f1
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:17:56 -08:00 |