Brian Behlendorf
|
3907b558de
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:30 -08:00 |
|
Brian Behlendorf
|
1321f5a556
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 11:25:28 -08:00 |
|
Brian Behlendorf
|
62618f9e3f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 11:25:28 -08:00 |
|
Brian Behlendorf
|
59de83533d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:22 -08:00 |
|
Brian Behlendorf
|
5598664343
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 11:25:21 -08:00 |
|
Brian Behlendorf
|
139baeef7c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 11:25:20 -08:00 |
|
Brian Behlendorf
|
4cd2a01056
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:14 -08:00 |
|
Brian Behlendorf
|
1467b3ec61
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 11:25:13 -08:00 |
|
Brian Behlendorf
|
34b7807dcf
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:10 -08:00 |
|
Brian Behlendorf
|
c169cfd26c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 11:25:08 -08:00 |
|
Brian Behlendorf
|
35af08eef4
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:05 -08:00 |
|
Brian Behlendorf
|
d27a92e176
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 11:25:03 -08:00 |
|
Brian Behlendorf
|
1077f2dfa1
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:25:00 -08:00 |
|
Brian Behlendorf
|
87a10fa22e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 11:24:58 -08:00 |
|
Brian Behlendorf
|
02eaaaaa32
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:24:55 -08:00 |
|
Brian Behlendorf
|
b66a092193
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 11:24:53 -08:00 |
|
Brian Behlendorf
|
8b3c167e46
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:24:50 -08:00 |
|
Brian Behlendorf
|
7a79a21f04
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 11:24:49 -08:00 |
|
Brian Behlendorf
|
3eb408d18e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:24:45 -08:00 |
|
Brian Behlendorf
|
07e90f6761
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 11:24:42 -08:00 |
|
Brian Behlendorf
|
2ef6ae9654
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:24:42 -08:00 |
|
Brian Behlendorf
|
d431498139
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:24:41 -08:00 |
|
Brian Behlendorf
|
17ac467bf0
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 11:24:40 -08:00 |
|
Brian Behlendorf
|
22f122e505
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 11:24:40 -08:00 |
|
Brian Behlendorf
|
50b70a0c9a
|
Resolve time conflict
|
2008-12-18 11:22:39 -08:00 |
|
Brian Behlendorf
|
69c7aab4de
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:42 -08:00 |
|
Brian Behlendorf
|
b62b9a17aa
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 10:07:40 -08:00 |
|
Brian Behlendorf
|
7ff9407ed2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:37 -08:00 |
|
Brian Behlendorf
|
80b34ac1a8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 10:07:35 -08:00 |
|
Brian Behlendorf
|
14851312ec
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:32 -08:00 |
|
Brian Behlendorf
|
058af4d43a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 10:07:30 -08:00 |
|
Brian Behlendorf
|
97b1c291e9
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:27 -08:00 |
|
Brian Behlendorf
|
36d0cc488f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 10:07:25 -08:00 |
|
Brian Behlendorf
|
4ee152896d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:22 -08:00 |
|
Brian Behlendorf
|
3fa5220373
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 10:07:21 -08:00 |
|
Brian Behlendorf
|
5ef411ff2e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:17 -08:00 |
|
Brian Behlendorf
|
4d834b9415
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 10:07:16 -08:00 |
|
Brian Behlendorf
|
858cb7de59
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:13 -08:00 |
|
Brian Behlendorf
|
36198eda31
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 10:07:11 -08:00 |
|
Brian Behlendorf
|
064910dd06
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:08 -08:00 |
|
Brian Behlendorf
|
b2c4e56a4f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 10:07:06 -08:00 |
|
Brian Behlendorf
|
f2a293e2a8
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:07:03 -08:00 |
|
Brian Behlendorf
|
2ea3f11b9e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 10:07:01 -08:00 |
|
Brian Behlendorf
|
5ca4c06010
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:06:58 -08:00 |
|
Brian Behlendorf
|
d4787b52b6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 10:06:56 -08:00 |
|
Brian Behlendorf
|
3d4997e4bb
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:06:53 -08:00 |
|
Brian Behlendorf
|
63249028a8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 10:06:52 -08:00 |
|
Brian Behlendorf
|
905ea4bb26
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:06:48 -08:00 |
|
Brian Behlendorf
|
88ad31655c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 10:06:47 -08:00 |
|
Brian Behlendorf
|
57d4abfe7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 10:06:46 -08:00 |