Brian Behlendorf
|
45191d7904
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:51:26 -08:00 |
|
Brian Behlendorf
|
70d2cc3556
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:22 -08:00 |
|
Brian Behlendorf
|
4115212df8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 10:51:21 -08:00 |
|
Brian Behlendorf
|
deec07f004
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:18 -08:00 |
|
Brian Behlendorf
|
f8bb636453
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-19 10:51:17 -08:00 |
|
Brian Behlendorf
|
e7bc76c3d4
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:14 -08:00 |
|
Brian Behlendorf
|
e79a0861ce
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:51:12 -08:00 |
|
Brian Behlendorf
|
8ce03bf718
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:09 -08:00 |
|
Brian Behlendorf
|
0938ee26f9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:51:08 -08:00 |
|
Brian Behlendorf
|
de6a384c50
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:05 -08:00 |
|
Brian Behlendorf
|
525a682d4d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:51:03 -08:00 |
|
Brian Behlendorf
|
23244e92b1
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:00 -08:00 |
|
Brian Behlendorf
|
91523abfb0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:50:59 -08:00 |
|
Brian Behlendorf
|
cd3fbfecc0
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:55 -08:00 |
|
Brian Behlendorf
|
f35afdefda
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:50:54 -08:00 |
|
Brian Behlendorf
|
1cc7d6725e
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:51 -08:00 |
|
Brian Behlendorf
|
38712a11db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:50:50 -08:00 |
|
Brian Behlendorf
|
25585a1884
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:50:49 -08:00 |
|
Brian Behlendorf
|
d69fa7f7a2
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:44 -08:00 |
|
Brian Behlendorf
|
870c514108
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:50:43 -08:00 |
|
Brian Behlendorf
|
4f5a560334
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:50:42 -08:00 |
|
Brian Behlendorf
|
3a0956d4ed
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:37 -08:00 |
|
Brian Behlendorf
|
7ea483ad86
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-19 10:50:35 -08:00 |
|
Brian Behlendorf
|
59ccc5eeca
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:32 -08:00 |
|
Brian Behlendorf
|
df433d5be0
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-19 10:50:31 -08:00 |
|
Brian Behlendorf
|
4fb4726ab3
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:28 -08:00 |
|
Brian Behlendorf
|
b0a2bea0ec
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 10:50:27 -08:00 |
|
Brian Behlendorf
|
c3bf7b7d8e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:24 -08:00 |
|
Brian Behlendorf
|
1c645cbecf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 10:50:23 -08:00 |
|
Brian Behlendorf
|
5df8ee66d3
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:20 -08:00 |
|
Brian Behlendorf
|
9f07edfa17
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:50:18 -08:00 |
|
Brian Behlendorf
|
84310d36cc
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:15 -08:00 |
|
Brian Behlendorf
|
59532b4e6c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-19 10:50:14 -08:00 |
|
Brian Behlendorf
|
d5eedbcd00
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:11 -08:00 |
|
Brian Behlendorf
|
f9b3e7f4e3
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 10:50:10 -08:00 |
|
Brian Behlendorf
|
1db27e736e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
ead0ea6da5
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
7b00be4871
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
d9b08ad01f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
66e0d59024
|
Whoops, add missing j
|
2008-12-19 10:48:11 -08:00 |
|
Brian Behlendorf
|
3f0ec06d17
|
Remove chunk from spa_import_common, readd
|
2008-12-19 10:45:59 -08:00 |
|
Brian Behlendorf
|
2ab4179d67
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:38:02 -08:00 |
|
Brian Behlendorf
|
e4a2a83b42
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:38:00 -08:00 |
|
Brian Behlendorf
|
246e4bd836
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:37:57 -08:00 |
|
Brian Behlendorf
|
903d6141fc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 10:37:56 -08:00 |
|
Brian Behlendorf
|
8599d4fda3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:37:53 -08:00 |
|
Brian Behlendorf
|
3d7c44a3de
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:37:52 -08:00 |
|
Brian Behlendorf
|
965e8927a6
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:37:49 -08:00 |
|
Brian Behlendorf
|
3e9b418237
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:37:48 -08:00 |
|
Brian Behlendorf
|
68d139599c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:37:44 -08:00 |