Brian Behlendorf
|
42c94f3b60
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 12:16:50 -08:00 |
|
Brian Behlendorf
|
e10f3040c1
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 12:16:46 -08:00 |
|
Brian Behlendorf
|
9d0fe1b6d9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:43 -08:00 |
|
Brian Behlendorf
|
1ff495a2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 12:16:41 -08:00 |
|
Brian Behlendorf
|
f7ff3bb3d9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:33 -08:00 |
|
Brian Behlendorf
|
2705a25010
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 12:16:30 -08:00 |
|
Brian Behlendorf
|
95a654d33c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:23 -08:00 |
|
Brian Behlendorf
|
f3edbceddc
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 12:16:20 -08:00 |
|
Brian Behlendorf
|
0f67ff3295
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:13 -08:00 |
|
Brian Behlendorf
|
5cfa6836f7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 12:16:10 -08:00 |
|
Brian Behlendorf
|
3b4ae3bef7
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:03 -08:00 |
|
Brian Behlendorf
|
d3066c085a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 12:16:00 -08:00 |
|
Brian Behlendorf
|
99e02a01a5
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:53 -08:00 |
|
Brian Behlendorf
|
be42a7683a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 12:15:50 -08:00 |
|
Brian Behlendorf
|
98f29fc963
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:43 -08:00 |
|
Brian Behlendorf
|
8136621404
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 12:15:41 -08:00 |
|
Brian Behlendorf
|
5dd837202a
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:34 -08:00 |
|
Brian Behlendorf
|
3c0f20229e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 12:15:31 -08:00 |
|
Brian Behlendorf
|
48a78f0957
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:26 -08:00 |
|
Brian Behlendorf
|
bcfa4f4d53
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 12:15:24 -08:00 |
|
Brian Behlendorf
|
49d8efa13b
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:18 -08:00 |
|
Brian Behlendorf
|
4344da1fa3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 12:15:16 -08:00 |
|
Brian Behlendorf
|
bb23271675
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:10 -08:00 |
|
Brian Behlendorf
|
4a3b280b22
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 12:15:08 -08:00 |
|
Brian Behlendorf
|
cc67d6a03e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 12:15:06 -08:00 |
|
Brian Behlendorf
|
7bf7d028a7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:57 -08:00 |
|
Brian Behlendorf
|
4df31a796e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 12:14:54 -08:00 |
|
Brian Behlendorf
|
ea3adc331a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 12:14:52 -08:00 |
|
Brian Behlendorf
|
aa69bfc29c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:41 -08:00 |
|
Brian Behlendorf
|
4d9dd57c96
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 12:14:39 -08:00 |
|
Brian Behlendorf
|
0fffebdbe8
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:32 -08:00 |
|
Brian Behlendorf
|
213be8b8c6
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 12:14:29 -08:00 |
|
Brian Behlendorf
|
6b3282a023
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:22 -08:00 |
|
Brian Behlendorf
|
3c36f366f0
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 12:14:19 -08:00 |
|
Brian Behlendorf
|
42cc88c62a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:12 -08:00 |
|
Brian Behlendorf
|
736dc9fdd6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 12:14:10 -08:00 |
|
Brian Behlendorf
|
5ef1c86907
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:04 -08:00 |
|
Brian Behlendorf
|
20301678dc
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 12:14:03 -08:00 |
|
Brian Behlendorf
|
902587a76c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:13:58 -08:00 |
|
Brian Behlendorf
|
9bd483b7e1
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 12:13:56 -08:00 |
|
Brian Behlendorf
|
4d2cd6e70a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:13:50 -08:00 |
|
Brian Behlendorf
|
b58a16492e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 12:13:44 -08:00 |
|
Brian Behlendorf
|
ac9f5a5af0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 12:13:43 -08:00 |
|
Brian Behlendorf
|
0f99484285
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 12:13:41 -08:00 |
|
Brian Behlendorf
|
e1db87107d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-12 12:13:40 -08:00 |
|
Brian Behlendorf
|
95f0795156
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 12:13:39 -08:00 |
|
Brian Behlendorf
|
769681a8b9
|
Trivial umem implementation if portable umem unavailable
|
2008-12-12 12:10:00 -08:00 |
|
Brian Behlendorf
|
ea6e9380e7
|
Add void to prototype
|
2008-12-12 11:12:11 -08:00 |
|
Brian Behlendorf
|
c37a30080e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 11:07:50 -08:00 |
|
Brian Behlendorf
|
9fd3c46555
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 11:07:49 -08:00 |