Brian Behlendorf
|
109d34244d
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2009-11-15 16:26:02 -08:00 |
|
Brian Behlendorf
|
49468cacf3
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:00 -08:00 |
|
Brian Behlendorf
|
8338a080a8
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2009-11-15 16:25:59 -08:00 |
|
Brian Behlendorf
|
a26d57f6f7
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:57 -08:00 |
|
Brian Behlendorf
|
86737ffc6c
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2009-11-15 16:25:56 -08:00 |
|
Brian Behlendorf
|
c2b8421841
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:55 -08:00 |
|
Brian Behlendorf
|
9d03c28169
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-11-15 16:25:53 -08:00 |
|
Brian Behlendorf
|
d8aef5d7bc
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:52 -08:00 |
|
Brian Behlendorf
|
030d49c262
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-11-15 16:25:50 -08:00 |
|
Brian Behlendorf
|
0aa61e8427
|
Remove zvol.c when updating in update-zfs.sh Linux version available.
|
2009-11-15 16:20:01 -08:00 |
|
Brian Behlendorf
|
e576375b9f
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:11:05 -08:00 |
|
Brian Behlendorf
|
e588ef08cb
|
Revert contents of linux-have-zpl topic branch.
|
2009-11-15 16:06:10 -08:00 |
|
Brian Behlendorf
|
d876a087ff
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-11-15 15:58:22 -08:00 |
|
Brian Behlendorf
|
b38252d3ec
|
Revert contents of linux-have-zvol topic branch.
|
2009-11-15 15:52:29 -08:00 |
|
Brian Behlendorf
|
924296f6b4
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-12 12:56:37 -08:00 |
|
Brian Behlendorf
|
498e1254f4
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:37 -08:00 |
|
Brian Behlendorf
|
66f03f9b0a
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:33 -08:00 |
|
Brian Behlendorf
|
b6e6e35a54
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-12 12:56:32 -08:00 |
|
Brian Behlendorf
|
70706381be
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:28 -08:00 |
|
Brian Behlendorf
|
f78b777004
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-11-12 12:56:27 -08:00 |
|
Brian Behlendorf
|
23cbe5b6fb
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:23 -08:00 |
|
Brian Behlendorf
|
76a66c08c2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-12 12:56:22 -08:00 |
|
Brian Behlendorf
|
224ff0ebc1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:18 -08:00 |
|
Brian Behlendorf
|
cb1d685dd1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-12 12:56:17 -08:00 |
|
Brian Behlendorf
|
00679cea1c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-12 12:56:13 -08:00 |
|
Brian Behlendorf
|
2c9a7c8282
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:13 -08:00 |
|
Brian Behlendorf
|
f872f7968a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-12 12:56:08 -08:00 |
|
Brian Behlendorf
|
e787523834
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:08 -08:00 |
|
Brian Behlendorf
|
acd3b4321f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:04 -08:00 |
|
Brian Behlendorf
|
b3b6ee0f08
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-12 12:56:03 -08:00 |
|
Brian Behlendorf
|
60ec816504
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:59 -08:00 |
|
Brian Behlendorf
|
7ffe671c18
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-12 12:55:58 -08:00 |
|
Brian Behlendorf
|
a4fb9a97f1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:54 -08:00 |
|
Brian Behlendorf
|
ad091adb8c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-12 12:55:53 -08:00 |
|
Brian Behlendorf
|
e68f100aaa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:49 -08:00 |
|
Brian Behlendorf
|
a29ea4d50f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-12 12:55:48 -08:00 |
|
Brian Behlendorf
|
69780e805d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:44 -08:00 |
|
Brian Behlendorf
|
2c1487c22c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-11-12 12:55:43 -08:00 |
|
Brian Behlendorf
|
f2ad87e27f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:39 -08:00 |
|
Brian Behlendorf
|
a9f00e5115
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-12 12:55:38 -08:00 |
|
Brian Behlendorf
|
1a1533ca9e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-12 12:55:38 -08:00 |
|
Brian Behlendorf
|
17360d9fd7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:30 -08:00 |
|
Brian Behlendorf
|
9256e1cb7b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-12 12:55:29 -08:00 |
|
Brian Behlendorf
|
2be7931436
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-12 12:55:28 -08:00 |
|
Brian Behlendorf
|
90aef60ba5
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:21 -08:00 |
|
Brian Behlendorf
|
6a111a71cc
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-12 12:55:20 -08:00 |
|
Brian Behlendorf
|
fdabbf4373
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:16 -08:00 |
|
Brian Behlendorf
|
9eb57a166b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-12 12:55:15 -08:00 |
|
Brian Behlendorf
|
5562cdcfad
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:11 -08:00 |
|
Brian Behlendorf
|
f70c9952ee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-12 12:55:10 -08:00 |