Brian Behlendorf
|
1f1d2500ec
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:51 -08:00 |
|
Brian Behlendorf
|
834679e9d0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 16:40:47 -08:00 |
|
Brian Behlendorf
|
beb33f687b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:40 -08:00 |
|
Brian Behlendorf
|
0b46ca1f5c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 16:40:36 -08:00 |
|
Brian Behlendorf
|
636a0d18f7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:30 -08:00 |
|
Brian Behlendorf
|
fd4be9bb6e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 16:40:26 -08:00 |
|
Brian Behlendorf
|
0a9102d48c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:19 -08:00 |
|
Brian Behlendorf
|
ef1c43e66f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 16:40:14 -08:00 |
|
Brian Behlendorf
|
5c3965be17
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:07 -08:00 |
|
Brian Behlendorf
|
8c5d486797
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 16:40:03 -08:00 |
|
Brian Behlendorf
|
7e94ad04e7
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:57 -08:00 |
|
Brian Behlendorf
|
3283dd9715
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:39:54 -08:00 |
|
Brian Behlendorf
|
30201d3275
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:48 -08:00 |
|
Brian Behlendorf
|
4f8a8bc8da
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:39:44 -08:00 |
|
Brian Behlendorf
|
7b1eb5d131
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:39:42 -08:00 |
|
Brian Behlendorf
|
b21cdf6cf2
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:31 -08:00 |
|
Brian Behlendorf
|
a4d96d5c16
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:39:28 -08:00 |
|
Brian Behlendorf
|
d763974558
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 16:39:26 -08:00 |
|
Brian Behlendorf
|
c09e63c6ae
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:15 -08:00 |
|
Brian Behlendorf
|
b0ce6ed002
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 16:39:11 -08:00 |
|
Brian Behlendorf
|
c58358299a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:05 -08:00 |
|
Brian Behlendorf
|
0cc0ec8911
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 16:39:01 -08:00 |
|
Brian Behlendorf
|
18a4630946
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:54 -08:00 |
|
Brian Behlendorf
|
5dca0ea32f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 16:38:50 -08:00 |
|
Brian Behlendorf
|
6f2751fe89
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:43 -08:00 |
|
Brian Behlendorf
|
e74d893984
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 16:38:39 -08:00 |
|
Brian Behlendorf
|
c3188a69e3
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:33 -08:00 |
|
Brian Behlendorf
|
f7ba355478
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 16:38:29 -08:00 |
|
Brian Behlendorf
|
f929ee92cb
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:23 -08:00 |
|
Brian Behlendorf
|
7dc7fa17c8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 16:38:18 -08:00 |
|
Brian Behlendorf
|
4d6969d387
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:12 -08:00 |
|
Brian Behlendorf
|
c92ab39541
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 16:38:08 -08:00 |
|
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
83b83ba1fc
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:00:48 -08:00 |
|
Brian Behlendorf
|
163d99cd44
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:00:47 -08:00 |
|
Brian Behlendorf
|
80c5df22cb
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:00:44 -08:00 |
|
Brian Behlendorf
|
2800480736
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:00:42 -08:00 |
|
Brian Behlendorf
|
867b188b30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:00:41 -08:00 |
|
Brian Behlendorf
|
154d07bd96
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:00:36 -08:00 |
|
Brian Behlendorf
|
995a374126
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:00:32 -08:00 |
|
Brian Behlendorf
|
76d40e2e81
|
Update exported symbols
|
2009-01-05 15:58:50 -08:00 |
|
Brian Behlendorf
|
284cca7129
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:46:01 -08:00 |
|
Brian Behlendorf
|
ce50f2053c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 15:45:59 -08:00 |
|
Brian Behlendorf
|
a1e7b1765a
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:56 -08:00 |
|
Brian Behlendorf
|
f42cd035ba
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 15:45:55 -08:00 |
|
Brian Behlendorf
|
1f2d2386ef
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:52 -08:00 |
|
Brian Behlendorf
|
46109c143d
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 15:45:51 -08:00 |
|
Brian Behlendorf
|
be1ad3c60a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:48 -08:00 |
|
Brian Behlendorf
|
24565e3301
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 15:45:46 -08:00 |
|
Brian Behlendorf
|
4d76070f2d
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:43 -08:00 |