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 |
|
Brian Behlendorf
|
f43a3baf0e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 15:44:50 -08:00 |
|
Brian Behlendorf
|
132e3e89ae
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:48 -08:00 |
|
Brian Behlendorf
|
bca6b89acf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 15:44:46 -08:00 |
|
Brian Behlendorf
|
57c442fb0e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:43 -08:00 |
|
Brian Behlendorf
|
037a076160
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 15:44:42 -08:00 |
|
Brian Behlendorf
|
8dc38960d2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:39 -08:00 |
|
Brian Behlendorf
|
3ca22288d8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 15:44:38 -08:00 |
|
Brian Behlendorf
|
4b9683dcf7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:35 -08:00 |
|
Brian Behlendorf
|
7c992011a1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 15:44:33 -08:00 |
|
Brian Behlendorf
|
760d78b9f8
|
Move default include paths after custom include paths so local stuff gets picked up first
|
2009-01-05 15:42:56 -08:00 |
|
Brian Behlendorf
|
4c741b2f9d
|
Revert changes and resolve include issue by adjusting include path ordering
|
2009-01-05 15:40:56 -08:00 |
|
Brian Behlendorf
|
90a0d01e20
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:25 -08:00 |
|
Brian Behlendorf
|
d28280dd17
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:21:24 -08:00 |
|
Brian Behlendorf
|
5f64944082
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:21 -08:00 |
|
Brian Behlendorf
|
bb4ca885b5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
5b2b7fc3df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
96989f8b00
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:14 -08:00 |
|
Brian Behlendorf
|
ab0b7157d5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 15:21:12 -08:00 |
|
Brian Behlendorf
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -08:00 |
|
Brian Behlendorf
|
eb5b7ed442
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:28 -08:00 |
|
Brian Behlendorf
|
bd81e10fbf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 14:29:27 -08:00 |
|
Brian Behlendorf
|
b355609c83
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:24 -08:00 |
|
Brian Behlendorf
|
c060e80947
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 14:29:23 -08:00 |