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
|
46df875d45
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 16:00:52 -08:00 |
|
Brian Behlendorf
|
73c2ee7c7a
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-05 16:00:50 -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
|
61203aa932
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 15:46:03 -08:00 |
|
Brian Behlendorf
|
7220e797f9
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-05 15:46:02 -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 |
|
Brian Behlendorf
|
d980c3784c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 15:45:42 -08:00 |
|
Brian Behlendorf
|
8ca8a55262
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:39 -08:00 |
|
Brian Behlendorf
|
d9fa727559
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 15:45:38 -08:00 |
|
Brian Behlendorf
|
88ee0ad134
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:35 -08:00 |
|
Brian Behlendorf
|
d590a594df
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 15:45:34 -08:00 |
|
Brian Behlendorf
|
474d6ff655
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:31 -08:00 |
|
Brian Behlendorf
|
62a048b3a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 15:45:29 -08:00 |
|
Brian Behlendorf
|
be475f5b0b
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:26 -08:00 |
|
Brian Behlendorf
|
bb747a10de
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 15:45:25 -08:00 |
|
Brian Behlendorf
|
5154d7139b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:22 -08:00 |
|
Brian Behlendorf
|
67c9f22507
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 15:45:21 -08:00 |
|
Brian Behlendorf
|
446547297e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:18 -08:00 |
|
Brian Behlendorf
|
407eef59dd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:45:17 -08:00 |
|
Brian Behlendorf
|
852bbd25c2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:14 -08:00 |
|
Brian Behlendorf
|
a9c201e00f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:45:13 -08:00 |
|
Brian Behlendorf
|
ef0cd2992f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:45:12 -08:00 |
|
Brian Behlendorf
|
f3eeb1c19b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:07 -08:00 |
|
Brian Behlendorf
|
dbc3840c65
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 15:45:06 -08:00 |
|
Brian Behlendorf
|
b2db87f254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 15:45:05 -08:00 |
|
Brian Behlendorf
|
0600323f42
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:00 -08:00 |
|
Brian Behlendorf
|
5b31f74cb6
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 15:44:59 -08:00 |
|
Brian Behlendorf
|
e221e913de
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:56 -08:00 |
|
Brian Behlendorf
|
e45783a4e1
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 15:44:55 -08:00 |
|
Brian Behlendorf
|
a4d6820715
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:52 -08:00 |