Brian Behlendorf
|
849ebdc632
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-09 14:16:06 -08:00 |
|
Brian Behlendorf
|
5acb0b8f17
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-09 14:16:05 -08:00 |
|
Brian Behlendorf
|
23818c2a8a
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-09 14:16:04 -08:00 |
|
Brian Behlendorf
|
e9c099ddd4
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-09 14:16:03 -08:00 |
|
Brian Behlendorf
|
4eaa3cd683
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-09 14:16:03 -08:00 |
|
Brian Behlendorf
|
cd24f8b154
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-09 14:16:01 -08:00 |
|
Brian Behlendorf
|
fff6686328
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-09 14:16:01 -08:00 |
|
Brian Behlendorf
|
1897a51dc7
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-09 14:16:00 -08:00 |
|
Brian Behlendorf
|
99028a91ec
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-09 14:15:59 -08:00 |
|
Brian Behlendorf
|
98c1df5b37
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-09 14:15:58 -08:00 |
|
Brian Behlendorf
|
e3afcb6227
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-09 14:15:57 -08:00 |
|
Brian Behlendorf
|
5e97ed8493
|
Move vmem* to libumem
|
2008-12-09 14:14:00 -08:00 |
|
Brian Behlendorf
|
4cedde5942
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-09 14:02:11 -08:00 |
|
Brian Behlendorf
|
08a9700ed2
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-09 14:02:10 -08:00 |
|
Brian Behlendorf
|
d5b23ff89f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:02:09 -08:00 |
|
Brian Behlendorf
|
516ea188eb
|
Resolve conflict
|
2008-12-09 14:02:04 -08:00 |
|
Brian Behlendorf
|
a894b59496
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:59:04 -08:00 |
|
Brian Behlendorf
|
9f39879525
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 13:59:03 -08:00 |
|
Brian Behlendorf
|
866265f0a9
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:59:00 -08:00 |
|
Brian Behlendorf
|
643cea9752
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 13:58:58 -08:00 |
|
Brian Behlendorf
|
e2da70478a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:55 -08:00 |
|
Brian Behlendorf
|
8ac6818294
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-09 13:58:54 -08:00 |
|
Brian Behlendorf
|
d5b6f2cfee
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:51 -08:00 |
|
Brian Behlendorf
|
06daeefb51
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-09 13:58:49 -08:00 |
|
Brian Behlendorf
|
8d4a474ce3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:46 -08:00 |
|
Brian Behlendorf
|
277e990ba9
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-09 13:58:45 -08:00 |
|
Brian Behlendorf
|
beb7e9174b
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:42 -08:00 |
|
Brian Behlendorf
|
0dcf124a5e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 13:58:40 -08:00 |
|
Brian Behlendorf
|
a1cc47d985
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:37 -08:00 |
|
Brian Behlendorf
|
e8b0b0f317
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-09 13:58:36 -08:00 |
|
Brian Behlendorf
|
9e2b8a193e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:33 -08:00 |
|
Brian Behlendorf
|
a788f2891c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-09 13:58:32 -08:00 |
|
Brian Behlendorf
|
0e4ab2dd6f
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:28 -08:00 |
|
Brian Behlendorf
|
1d41ae0236
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-09 13:58:27 -08:00 |
|
Brian Behlendorf
|
bc809f6b22
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:24 -08:00 |
|
Brian Behlendorf
|
ac3b294e3b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 13:58:23 -08:00 |
|
Brian Behlendorf
|
e6d87a20b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 13:58:22 -08:00 |
|
Brian Behlendorf
|
5fc8d2b2bf
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:17 -08:00 |
|
Brian Behlendorf
|
b3238050d0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-09 13:58:16 -08:00 |
|
Brian Behlendorf
|
03454ab344
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 13:58:15 -08:00 |
|
Brian Behlendorf
|
b9d4d3aa43
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:10 -08:00 |
|
Brian Behlendorf
|
8e5dafd100
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 13:58:08 -08:00 |
|
Brian Behlendorf
|
5ca665138f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:05 -08:00 |
|
Brian Behlendorf
|
0357eb64a4
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 13:58:04 -08:00 |
|
Brian Behlendorf
|
b8c51a5c7a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:01 -08:00 |
|
Brian Behlendorf
|
9ab4dcc133
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 13:58:00 -08:00 |
|
Brian Behlendorf
|
5262103dbc
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:57:56 -08:00 |
|
Brian Behlendorf
|
8acd1663f9
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 13:57:55 -08:00 |
|
Brian Behlendorf
|
0d0e1d4e69
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:57:52 -08:00 |
|
Brian Behlendorf
|
71d1b9bbf9
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-09 13:57:51 -08:00 |