Brian Behlendorf
|
84de9dbfb4
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:47:01 -08:00 |
|
Brian Behlendorf
|
97dab5053e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 13:46:59 -08:00 |
|
Brian Behlendorf
|
7fde127c7b
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:56 -08:00 |
|
Brian Behlendorf
|
44e329c167
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 13:46:55 -08:00 |
|
Brian Behlendorf
|
61c2c91b4e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:52 -08:00 |
|
Brian Behlendorf
|
dbcb8f3921
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 13:46:51 -08:00 |
|
Brian Behlendorf
|
8cd6e99d4e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:48 -08:00 |
|
Brian Behlendorf
|
a9bfb78b5a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 13:46:47 -08:00 |
|
Brian Behlendorf
|
556591b23b
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:44 -08:00 |
|
Brian Behlendorf
|
2ce1f366f3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 13:46:43 -08:00 |
|
Brian Behlendorf
|
310ae7fd2a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 13:46:42 -08:00 |
|
Brian Behlendorf
|
63ed9925d4
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:38 -08:00 |
|
Brian Behlendorf
|
30acc1191a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 13:46:36 -08:00 |
|
Brian Behlendorf
|
3bc01c0326
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 13:46:35 -08:00 |
|
Brian Behlendorf
|
9bece1f123
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:31 -08:00 |
|
Brian Behlendorf
|
3cff0664dc
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 13:46:29 -08:00 |
|
Brian Behlendorf
|
2c7c3f3bd6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:26 -08:00 |
|
Brian Behlendorf
|
4c770d136e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 13:46:25 -08:00 |
|
Brian Behlendorf
|
3186c563fa
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:22 -08:00 |
|
Brian Behlendorf
|
f88ab3c355
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 13:46:21 -08:00 |
|
Brian Behlendorf
|
7a4ce4e6aa
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:18 -08:00 |
|
Brian Behlendorf
|
ca09b22dfb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 13:46:17 -08:00 |
|
Brian Behlendorf
|
bfc158397e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:14 -08:00 |
|
Brian Behlendorf
|
7b3c159290
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 13:46:13 -08:00 |
|
Brian Behlendorf
|
2a93fad34b
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:10 -08:00 |
|
Brian Behlendorf
|
1457950d0b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 13:46:09 -08:00 |
|
Brian Behlendorf
|
80ed6c342d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:06 -08:00 |
|
Brian Behlendorf
|
e13c5961bb
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 13:46:04 -08:00 |
|
Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
2acdd28248
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:52 -08:00 |
|
Brian Behlendorf
|
65b0ce28f1
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 13:16:51 -08:00 |
|
Brian Behlendorf
|
b07d78c1a8
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:48 -08:00 |
|
Brian Behlendorf
|
8cab1dfe83
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 13:16:47 -08:00 |
|
Brian Behlendorf
|
dc9ca5dcb5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:44 -08:00 |
|
Brian Behlendorf
|
087a94a78e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 13:16:43 -08:00 |
|
Brian Behlendorf
|
a1b05ed992
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:40 -08:00 |
|
Brian Behlendorf
|
3ffae097f4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 13:16:38 -08:00 |
|
Brian Behlendorf
|
1f31f9eddf
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:36 -08:00 |
|
Brian Behlendorf
|
640402a3b3
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 13:16:34 -08:00 |
|
Brian Behlendorf
|
4a4c0dd4ea
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:31 -08:00 |
|
Brian Behlendorf
|
4b174dadff
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 13:16:30 -08:00 |
|
Brian Behlendorf
|
700c86d834
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:27 -08:00 |
|
Brian Behlendorf
|
a2c166b2f0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 13:16:26 -08:00 |
|
Brian Behlendorf
|
dcb0536bb3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:23 -08:00 |
|
Brian Behlendorf
|
b4d633a516
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 13:16:22 -08:00 |
|
Brian Behlendorf
|
cb90989ba4
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:19 -08:00 |
|
Brian Behlendorf
|
224abc2a10
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 13:16:17 -08:00 |
|
Brian Behlendorf
|
3c74429527
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:15 -08:00 |
|
Brian Behlendorf
|
c6fdd93efe
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 13:16:13 -08:00 |
|
Brian Behlendorf
|
62f7273a41
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:10 -08:00 |