Brian Behlendorf
|
24daf7747f
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
0e310d30de
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
10dcf485d3
|
First fit allocator unused comment it out.
|
2009-07-07 16:23:09 -07:00 |
|
Brian Behlendorf
|
ebda366c1c
|
Add missing case introduced by rebase.
|
2009-07-07 16:22:33 -07:00 |
|
Brian Behlendorf
|
eb753aca11
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:13:37 -07:00 |
|
Brian Behlendorf
|
b8eeb71363
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-07 16:13:35 -07:00 |
|
Brian Behlendorf
|
2a1913641a
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:13:26 -07:00 |
|
Brian Behlendorf
|
9efa5d34f1
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-07 16:13:23 -07:00 |
|
Brian Behlendorf
|
20f6107bc0
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:13:14 -07:00 |
|
Brian Behlendorf
|
83bdfba9ad
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-07 16:13:12 -07:00 |
|
Brian Behlendorf
|
63f97754e1
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:13:03 -07:00 |
|
Brian Behlendorf
|
066bf876a7
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-07 16:13:00 -07:00 |
|
Brian Behlendorf
|
21ecc91b07
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:12:51 -07:00 |
|
Brian Behlendorf
|
1b47b965e9
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-07 16:12:49 -07:00 |
|
Brian Behlendorf
|
9c6df27321
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:12:39 -07:00 |
|
Brian Behlendorf
|
8b74968f01
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-07 16:12:37 -07:00 |
|
Brian Behlendorf
|
921caef5b7
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:12:28 -07:00 |
|
Brian Behlendorf
|
683bd48ba3
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-07 16:12:25 -07:00 |
|
Brian Behlendorf
|
8063d2bd5b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:12:16 -07:00 |
|
Brian Behlendorf
|
2eeed27184
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-07 16:12:13 -07:00 |
|
Brian Behlendorf
|
53bde814be
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:12:03 -07:00 |
|
Brian Behlendorf
|
e43a539d25
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-07 16:12:00 -07:00 |
|
Brian Behlendorf
|
dc488ec497
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:11:52 -07:00 |
|
Brian Behlendorf
|
0e70c1ff85
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-07 16:11:49 -07:00 |
|
Brian Behlendorf
|
389d12909c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:11:40 -07:00 |
|
Brian Behlendorf
|
82ad66258e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 16:11:37 -07:00 |
|
Brian Behlendorf
|
162161164e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:11:27 -07:00 |
|
Brian Behlendorf
|
d9a91bf46b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-07 16:11:24 -07:00 |
|
Brian Behlendorf
|
9321091d4c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:11:15 -07:00 |
|
Brian Behlendorf
|
3977001d03
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-07 16:11:12 -07:00 |
|
Brian Behlendorf
|
80528a7792
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-07 16:11:11 -07:00 |
|
Brian Behlendorf
|
033c892558
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:10:55 -07:00 |
|
Brian Behlendorf
|
f6880f590e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 16:10:52 -07:00 |
|
Brian Behlendorf
|
77e4a2039c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 16:10:51 -07:00 |
|
Brian Behlendorf
|
39aab503ce
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:10:34 -07:00 |
|
Brian Behlendorf
|
5d2bdd5b5e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-07 16:10:32 -07:00 |
|
Brian Behlendorf
|
a002e98883
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:10:23 -07:00 |
|
Brian Behlendorf
|
aab811ea53
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-07 16:10:20 -07:00 |
|
Brian Behlendorf
|
8d48183571
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:10:11 -07:00 |
|
Brian Behlendorf
|
5aff4d9230
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-07 16:10:07 -07:00 |
|
Brian Behlendorf
|
4c5e79a48a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:09:57 -07:00 |
|
Brian Behlendorf
|
fa4397acb8
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-07 16:09:55 -07:00 |
|
Brian Behlendorf
|
e0e9ae285b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:09:45 -07:00 |
|
Brian Behlendorf
|
39ab61050e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-07 16:09:42 -07:00 |
|
Brian Behlendorf
|
e959cea877
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:09:31 -07:00 |
|
Brian Behlendorf
|
7ba45f1400
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-07 16:09:29 -07:00 |
|
Brian Behlendorf
|
e122a47cd8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:09:19 -07:00 |
|
Brian Behlendorf
|
b8af4a2181
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 16:09:16 -07:00 |
|
Brian Behlendorf
|
c460e5edb0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 16:09:15 -07:00 |
|
Brian Behlendorf
|
04a83f2337
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 16:09:13 -07:00 |