Brian Behlendorf
|
195c942213
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-09 15:08:34 -07:00 |
|
Brian Behlendorf
|
dd1f0280d4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:25 -07:00 |
|
Brian Behlendorf
|
d6483c73ac
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-09 15:08:21 -07:00 |
|
Brian Behlendorf
|
791241dfb0
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:11 -07:00 |
|
Brian Behlendorf
|
7211f81057
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-09 15:08:07 -07:00 |
|
Brian Behlendorf
|
24662d61d9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-09 15:08:06 -07:00 |
|
Brian Behlendorf
|
2f4e745a09
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-09 15:08:04 -07:00 |
|
Brian Behlendorf
|
893e11c6be
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-09 15:08:03 -07:00 |
|
Brian Behlendorf
|
bed14af385
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-07-09 15:08:03 -07:00 |
|
Brian Behlendorf
|
ae132945b4
|
Add suggested paranthesis.
|
2009-07-09 14:59:10 -07:00 |
|
Brian Behlendorf
|
f13edd3084
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 14:20:38 -07:00 |
|
Brian Behlendorf
|
8a849a66fe
|
Wrap all the ACL interfaces for now with HAVE_ZPL. They are integrated
with the vfs layer which is not at all supported yet.
|
2009-07-09 14:11:13 -07:00 |
|
Brian Behlendorf
|
34b66609d7
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:22:40 -07:00 |
|
Brian Behlendorf
|
61beddc02d
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-09 13:22:36 -07:00 |
|
Brian Behlendorf
|
25a4d21569
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:22:26 -07:00 |
|
Brian Behlendorf
|
e15d839ab5
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-09 13:22:23 -07:00 |
|
Brian Behlendorf
|
0cd230f114
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:22:13 -07:00 |
|
Brian Behlendorf
|
99880c2dc1
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-09 13:22:09 -07:00 |
|
Brian Behlendorf
|
0aedec28b8
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:21:56 -07:00 |
|
Brian Behlendorf
|
91ca27b520
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-09 13:21:52 -07:00 |
|
Brian Behlendorf
|
020fbbe1d3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:21:42 -07:00 |
|
Brian Behlendorf
|
478d141f35
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-09 13:21:39 -07:00 |
|
Brian Behlendorf
|
bf2e8e29b8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:21:28 -07:00 |
|
Brian Behlendorf
|
a3a9c56aa1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-09 13:21:25 -07:00 |
|
Brian Behlendorf
|
df466b9b17
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:21:14 -07:00 |
|
Brian Behlendorf
|
3c49d3cf00
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-09 13:21:10 -07:00 |
|
Brian Behlendorf
|
69eb459934
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:21:00 -07:00 |
|
Brian Behlendorf
|
47aea3522c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-09 13:20:57 -07:00 |
|
Brian Behlendorf
|
a0790c13db
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:20:44 -07:00 |
|
Brian Behlendorf
|
4ba7a9fbfb
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-09 13:20:40 -07:00 |
|
Brian Behlendorf
|
b4ba838600
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:20:30 -07:00 |
|
Brian Behlendorf
|
b11df77db9
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-09 13:20:27 -07:00 |
|
Brian Behlendorf
|
d9654b1677
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:20:15 -07:00 |
|
Brian Behlendorf
|
8fba9a5957
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-09 13:20:09 -07:00 |
|
Brian Behlendorf
|
00ca9b8d57
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:19:59 -07:00 |
|
Brian Behlendorf
|
8129849f84
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-09 13:19:55 -07:00 |
|
Brian Behlendorf
|
2fe1a22c91
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:19:45 -07:00 |
|
Brian Behlendorf
|
f99ad7f4c3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-09 13:19:41 -07:00 |
|
Brian Behlendorf
|
ebb013f2dd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-09 13:19:39 -07:00 |
|
Brian Behlendorf
|
cfeba83656
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:19:20 -07:00 |
|
Brian Behlendorf
|
176ce8248a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-09 13:19:17 -07:00 |
|
Brian Behlendorf
|
db193d4ca9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-09 13:19:15 -07:00 |
|
Brian Behlendorf
|
287f9bee9c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:18:56 -07:00 |
|
Brian Behlendorf
|
c9d25cdf92
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-09 13:18:52 -07:00 |
|
Brian Behlendorf
|
bff0452fe1
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:18:42 -07:00 |
|
Brian Behlendorf
|
bf86b4101b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-09 13:18:39 -07:00 |
|
Brian Behlendorf
|
078d62a4a2
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:18:28 -07:00 |
|
Brian Behlendorf
|
b7ded58834
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-09 13:18:25 -07:00 |
|
Brian Behlendorf
|
1c3cc50b9d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-09 13:18:14 -07:00 |
|
Brian Behlendorf
|
fcdf07e3c8
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-09 13:18:10 -07:00 |