Brian Behlendorf
|
e65061106f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:15 -08:00 |
|
Brian Behlendorf
|
7debf8e578
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:24:13 -08:00 |
|
Brian Behlendorf
|
95fb316416
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:10 -08:00 |
|
Brian Behlendorf
|
61a794cec7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:24:09 -08:00 |
|
Brian Behlendorf
|
ce0ef71d6c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:05 -08:00 |
|
Brian Behlendorf
|
0e2cb59efb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:24:04 -08:00 |
|
Brian Behlendorf
|
fff105fd2a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:01 -08:00 |
|
Brian Behlendorf
|
c8a3446319
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:24:00 -08:00 |
|
Brian Behlendorf
|
6cf672e90d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:23:59 -08:00 |
|
Brian Behlendorf
|
8ad4cbeac0
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:54 -08:00 |
|
Brian Behlendorf
|
2277922795
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 10:23:52 -08:00 |
|
Brian Behlendorf
|
25afaa1e57
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:23:52 -08:00 |
|
Brian Behlendorf
|
9e6c7a32ce
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:46 -08:00 |
|
Brian Behlendorf
|
d7057fc4ab
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 10:23:45 -08:00 |
|
Brian Behlendorf
|
0b63e9b3b1
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:42 -08:00 |
|
Brian Behlendorf
|
d0b24760c5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 10:23:40 -08:00 |
|
Brian Behlendorf
|
6480ac4c47
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:37 -08:00 |
|
Brian Behlendorf
|
8264ba977b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 10:23:35 -08:00 |
|
Brian Behlendorf
|
a074ac7e99
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:32 -08:00 |
|
Brian Behlendorf
|
2fed020153
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 10:23:31 -08:00 |
|
Brian Behlendorf
|
f78526d37e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:28 -08:00 |
|
Brian Behlendorf
|
181222687e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 10:23:26 -08:00 |
|
Brian Behlendorf
|
c66de6fa75
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:23 -08:00 |
|
Brian Behlendorf
|
3261cb91a9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 10:23:21 -08:00 |
|
Brian Behlendorf
|
79e25a5194
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:18 -08:00 |
|
Brian Behlendorf
|
6f389fe62f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 10:23:16 -08:00 |
|
Brian Behlendorf
|
a9e37c248d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 10:23:16 -08:00 |
|
Brian Behlendorf
|
342c4d05d6
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 10:23:15 -08:00 |
|
Brian Behlendorf
|
f9e9cd6f18
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 10:23:14 -08:00 |
|
Brian Behlendorf
|
817ecade1a
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 10:23:14 -08:00 |
|
Brian Behlendorf
|
6da71c1404
|
Fix twop more missing voids in prototypes
|
2008-12-22 10:20:57 -08:00 |
|
Brian Behlendorf
|
42344f04c1
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:15:20 -08:00 |
|
Brian Behlendorf
|
8fdc6ee079
|
Stub out two more funcs until zpl support exists
|
2008-12-22 10:13:31 -08:00 |
|
Brian Behlendorf
|
8b0a74c863
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:11:31 -08:00 |
|
Brian Behlendorf
|
c72d6b30e8
|
Remove one more header
|
2008-12-22 10:07:53 -08:00 |
|
Brian Behlendorf
|
0ecac4865c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:03:22 -08:00 |
|
Brian Behlendorf
|
e8b703cb46
|
Add sys/time.h
|
2008-12-22 10:00:01 -08:00 |
|
Brian Behlendorf
|
3ef8f98c50
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:39 -08:00 |
|
Brian Behlendorf
|
d8c6c982e6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 09:27:37 -08:00 |
|
Brian Behlendorf
|
0a376cabd7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:34 -08:00 |
|
Brian Behlendorf
|
6f507a46a1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 09:27:33 -08:00 |
|
Brian Behlendorf
|
861cbda056
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:30 -08:00 |
|
Brian Behlendorf
|
ea48a9d80a
|
Resolve conflict
|
2008-12-22 09:27:25 -08:00 |
|
Brian Behlendorf
|
e72bd17227
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:59 -08:00 |
|
Brian Behlendorf
|
233dda723f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:26:58 -08:00 |
|
Brian Behlendorf
|
47d67fd0e5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:55 -08:00 |
|
Brian Behlendorf
|
febd99481b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 09:26:53 -08:00 |
|
Brian Behlendorf
|
0bae2d733f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:50 -08:00 |
|
Brian Behlendorf
|
0d36e605d1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 09:26:49 -08:00 |
|
Brian Behlendorf
|
e492dd3181
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:46 -08:00 |