Brian Behlendorf
|
b6865ac44a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:36:36 -08:00 |
|
Brian Behlendorf
|
ec5a044391
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
76247cc21d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
800463b2ef
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
d9cd04fc35
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
7e159c86a3
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:36:32 -08:00 |
|
Brian Behlendorf
|
294ebb7537
|
Fix C90 for(int i;;;) compliance issues
|
2008-12-19 10:34:41 -08:00 |
|
Brian Behlendorf
|
74bbeffcc7
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:44 -08:00 |
|
Brian Behlendorf
|
b1f73ca6ac
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:27:43 -08:00 |
|
Brian Behlendorf
|
cfd9182e04
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:40 -08:00 |
|
Brian Behlendorf
|
a4c497f134
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 10:27:39 -08:00 |
|
Brian Behlendorf
|
dfb8818330
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:36 -08:00 |
|
Brian Behlendorf
|
eeb4e47031
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:27:35 -08:00 |
|
Brian Behlendorf
|
ef84cfd7f2
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:32 -08:00 |
|
Brian Behlendorf
|
06528b7d6e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:27:31 -08:00 |
|
Brian Behlendorf
|
a7bef81524
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:28 -08:00 |
|
Brian Behlendorf
|
1321ae6247
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 10:27:27 -08:00 |
|
Brian Behlendorf
|
f60d446c24
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:24 -08:00 |
|
Brian Behlendorf
|
d8929a23cc
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-19 10:27:22 -08:00 |
|
Brian Behlendorf
|
62b5fb6cb7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:19 -08:00 |
|
Brian Behlendorf
|
bc6d2fee28
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:27:18 -08:00 |
|
Brian Behlendorf
|
5da934808e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:15 -08:00 |
|
Brian Behlendorf
|
27f8780a37
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:27:14 -08:00 |
|
Brian Behlendorf
|
0defefa2f4
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:11 -08:00 |
|
Brian Behlendorf
|
9cccccce7c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:27:10 -08:00 |
|
Brian Behlendorf
|
7d29125b62
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:07 -08:00 |
|
Brian Behlendorf
|
6fedd6ca38
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:27:06 -08:00 |
|
Brian Behlendorf
|
ff25b6f1cf
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:27:03 -08:00 |
|
Brian Behlendorf
|
434356f979
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:27:02 -08:00 |
|
Brian Behlendorf
|
467ebbd17c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:58 -08:00 |
|
Brian Behlendorf
|
8985e2430d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
4ee870c380
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
1d25ad262b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:52 -08:00 |
|
Brian Behlendorf
|
9a9a66d507
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:26:51 -08:00 |
|
Brian Behlendorf
|
f1ba2464f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:26:50 -08:00 |
|
Brian Behlendorf
|
ca92b150c5
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:45 -08:00 |
|
Brian Behlendorf
|
cfacff5b49
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-19 10:26:44 -08:00 |
|
Brian Behlendorf
|
f26fcc3ae8
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:41 -08:00 |
|
Brian Behlendorf
|
019f445d80
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-19 10:26:40 -08:00 |
|
Brian Behlendorf
|
ce07836a98
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:37 -08:00 |
|
Brian Behlendorf
|
7dbfdcfd46
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 10:26:36 -08:00 |
|
Brian Behlendorf
|
a0eb6203f8
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:33 -08:00 |
|
Brian Behlendorf
|
59a529aa53
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 10:26:31 -08:00 |
|
Brian Behlendorf
|
3c31d8283b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:28 -08:00 |
|
Brian Behlendorf
|
d70529b743
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:26:27 -08:00 |
|
Brian Behlendorf
|
cb3988c23f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:24 -08:00 |
|
Brian Behlendorf
|
a299f54f84
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-19 10:26:23 -08:00 |
|
Brian Behlendorf
|
a5e6632531
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:20 -08:00 |
|
Brian Behlendorf
|
881e29554d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 10:26:19 -08:00 |
|
Brian Behlendorf
|
e3815b6d3f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:26:18 -08:00 |