Brian Behlendorf
|
458e16498e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:41 -08:00 |
|
Brian Behlendorf
|
1894d88357
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 11:30:39 -08:00 |
|
Brian Behlendorf
|
4877232f37
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:36 -08:00 |
|
Brian Behlendorf
|
c3d28dff20
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 11:30:35 -08:00 |
|
Brian Behlendorf
|
28c45110be
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:32 -08:00 |
|
Brian Behlendorf
|
b97d408428
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 11:30:30 -08:00 |
|
Brian Behlendorf
|
fa61cfbd99
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:27 -08:00 |
|
Brian Behlendorf
|
ed05a1eaf2
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 11:30:25 -08:00 |
|
Brian Behlendorf
|
7144d73a02
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:22 -08:00 |
|
Brian Behlendorf
|
a97fc13639
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:30:21 -08:00 |
|
Brian Behlendorf
|
55fefa702d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:17 -08:00 |
|
Brian Behlendorf
|
a78504bfcd
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:30:15 -08:00 |
|
Brian Behlendorf
|
8ac9d0e5ef
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:12 -08:00 |
|
Brian Behlendorf
|
65c1f65a81
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:30:11 -08:00 |
|
Brian Behlendorf
|
464310aa83
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:08 -08:00 |
|
Brian Behlendorf
|
72aaf61e8a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:30:06 -08:00 |
|
Brian Behlendorf
|
16153aa31d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:30:06 -08:00 |
|
Brian Behlendorf
|
a2bb545559
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:30:00 -08:00 |
|
Brian Behlendorf
|
3538a1a92f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:29:59 -08:00 |
|
Brian Behlendorf
|
b5a525cbf6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:29:58 -08:00 |
|
Brian Behlendorf
|
505a649bd2
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:53 -08:00 |
|
Brian Behlendorf
|
bcd882b137
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 11:29:51 -08:00 |
|
Brian Behlendorf
|
178e003675
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:48 -08:00 |
|
Brian Behlendorf
|
4d8eaa86df
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 11:29:47 -08:00 |
|
Brian Behlendorf
|
c9f062d3c4
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:43 -08:00 |
|
Brian Behlendorf
|
80952e161f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:29:42 -08:00 |
|
Brian Behlendorf
|
28d06d3e84
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:39 -08:00 |
|
Brian Behlendorf
|
1cea686e6b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 11:29:37 -08:00 |
|
Brian Behlendorf
|
b817f5443c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:34 -08:00 |
|
Brian Behlendorf
|
f49cf4eead
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 11:29:33 -08:00 |
|
Brian Behlendorf
|
0a28b2e121
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:29 -08:00 |
|
Brian Behlendorf
|
e48a90a7fa
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 11:29:28 -08:00 |
|
Brian Behlendorf
|
06ab7d120f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:25 -08:00 |
|
Brian Behlendorf
|
575ebbc5dc
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 11:29:23 -08:00 |
|
Brian Behlendorf
|
6b1fc7b8ee
|
Add linker flags
|
2008-12-22 11:27:30 -08:00 |
|
Brian Behlendorf
|
356e666729
|
Add linker flags
|
2008-12-22 11:26:16 -08:00 |
|
Brian Behlendorf
|
9fb38f075b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:25:39 -08:00 |
|
Brian Behlendorf
|
24a90ad2c3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
864a432edd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
34d556babb
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:25:37 -08:00 |
|
Brian Behlendorf
|
7c89e6b7d5
|
Fix prototype
|
2008-12-22 11:25:28 -08:00 |
|
Brian Behlendorf
|
732dbba073
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:09:18 -08:00 |
|
Brian Behlendorf
|
aaa5f53f3c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 11:09:17 -08:00 |
|
Brian Behlendorf
|
e2a19778b9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:09:14 -08:00 |
|
Brian Behlendorf
|
a352d7b2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 11:09:13 -08:00 |
|
Brian Behlendorf
|
d85893146f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:09:09 -08:00 |
|
Brian Behlendorf
|
1419a88378
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:09:07 -08:00 |
|
Brian Behlendorf
|
4e7a1ac55c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:09:04 -08:00 |
|
Brian Behlendorf
|
92b3580449
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:09:02 -08:00 |
|
Brian Behlendorf
|
4604f9aefc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:59 -08:00 |