Brian Behlendorf
|
283fb597f1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:44:41 -08:00 |
|
Brian Behlendorf
|
ea608c5dad
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:38 -08:00 |
|
Brian Behlendorf
|
38f780909b
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:44:36 -08:00 |
|
Brian Behlendorf
|
8b4937ced9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:33 -08:00 |
|
Brian Behlendorf
|
72d21b338c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:44:31 -08:00 |
|
Brian Behlendorf
|
e7c038d635
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:28 -08:00 |
|
Brian Behlendorf
|
5200db236f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:44:26 -08:00 |
|
Brian Behlendorf
|
08d51f49e7
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:23 -08:00 |
|
Brian Behlendorf
|
c20b05ba8f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:44:21 -08:00 |
|
Brian Behlendorf
|
2e7ba8c88a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:18 -08:00 |
|
Brian Behlendorf
|
97e1edd90d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:44:16 -08:00 |
|
Brian Behlendorf
|
6afb4920e9
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:13 -08:00 |
|
Brian Behlendorf
|
2543240d85
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:44:11 -08:00 |
|
Brian Behlendorf
|
30367b24f8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:08 -08:00 |
|
Brian Behlendorf
|
c513e66884
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:44:06 -08:00 |
|
Brian Behlendorf
|
360d4841e7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:44:05 -08:00 |
|
Brian Behlendorf
|
b0613290eb
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:00 -08:00 |
|
Brian Behlendorf
|
bc05eda218
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:43:59 -08:00 |
|
Brian Behlendorf
|
07901e75cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:43:58 -08:00 |
|
Brian Behlendorf
|
d7313c7f73
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:52 -08:00 |
|
Brian Behlendorf
|
faa5fba441
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 13:43:51 -08:00 |
|
Brian Behlendorf
|
6ab7cee90a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:47 -08:00 |
|
Brian Behlendorf
|
452dc99faf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 13:43:46 -08:00 |
|
Brian Behlendorf
|
0436b58c98
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:43 -08:00 |
|
Brian Behlendorf
|
08d56050b5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:43:41 -08:00 |
|
Brian Behlendorf
|
bef84274f4
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:38 -08:00 |
|
Brian Behlendorf
|
0394ba571f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 13:43:36 -08:00 |
|
Brian Behlendorf
|
beb3120213
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:33 -08:00 |
|
Brian Behlendorf
|
3307f09de7
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:43:31 -08:00 |
|
Brian Behlendorf
|
db5ea2647f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:28 -08:00 |
|
Brian Behlendorf
|
f4c1fcc467
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 13:43:26 -08:00 |
|
Brian Behlendorf
|
bbd1cc6feb
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:23 -08:00 |
|
Brian Behlendorf
|
ba1d7d1ee0
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 13:43:21 -08:00 |
|
Brian Behlendorf
|
bab7f42832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:43:20 -08:00 |
|
Brian Behlendorf
|
d6c4c3cce2
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
5ce7826ab4
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
732fe6a75f
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
973a9d5a79
|
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
|
2008-12-18 13:41:21 -08:00 |
|
Brian Behlendorf
|
7d3f61a94d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:19 -08:00 |
|
Brian Behlendorf
|
d36c4b80f9
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 13:28:17 -08:00 |
|
Brian Behlendorf
|
c95626a90d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:14 -08:00 |
|
Brian Behlendorf
|
3e24722dc1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:28:12 -08:00 |
|
Brian Behlendorf
|
3a0347f52d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:09 -08:00 |
|
Brian Behlendorf
|
9778e475c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:28:07 -08:00 |
|
Brian Behlendorf
|
2330534d4f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:04 -08:00 |
|
Brian Behlendorf
|
7adc17a007
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:28:02 -08:00 |
|
Brian Behlendorf
|
71723595c2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:59 -08:00 |
|
Brian Behlendorf
|
6c21e29045
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:27:57 -08:00 |
|
Brian Behlendorf
|
a9ed19bc50
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:54 -08:00 |
|
Brian Behlendorf
|
80037044d7
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:27:52 -08:00 |