Brian Behlendorf
|
f90ac4206e
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2010-04-29 12:03:32 -07:00 |
|
Brian Behlendorf
|
5ef793a667
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:31 -07:00 |
|
Brian Behlendorf
|
e366632a94
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2010-04-29 12:03:29 -07:00 |
|
Brian Behlendorf
|
b1d3337507
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:27 -07:00 |
|
Brian Behlendorf
|
7571f9a6c1
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2010-04-29 12:03:26 -07:00 |
|
Brian Behlendorf
|
5afe7d53a2
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:25 -07:00 |
|
Brian Behlendorf
|
1ad1f4f5d6
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2010-04-29 12:03:23 -07:00 |
|
Brian Behlendorf
|
cf77a0eba6
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:21 -07:00 |
|
Brian Behlendorf
|
b3b5351af0
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2010-04-29 12:03:20 -07:00 |
|
Brian Behlendorf
|
8279f80885
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:18 -07:00 |
|
Brian Behlendorf
|
c708851b13
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2010-04-29 12:03:17 -07:00 |
|
Brian Behlendorf
|
3affbe6d7e
|
Update nvpair's to include nv_alloc_fixed support
|
2010-04-29 11:59:41 -07:00 |
|
Brian Behlendorf
|
33e8850a49
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:42 -07:00 |
|
Brian Behlendorf
|
a534447ac5
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-04-29 11:02:40 -07:00 |
|
Brian Behlendorf
|
f11ef5a230
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:34 -07:00 |
|
Brian Behlendorf
|
1697a07b72
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-04-29 11:02:32 -07:00 |
|
Brian Behlendorf
|
af9c76ff3f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:27 -07:00 |
|
Brian Behlendorf
|
c63aca4333
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-04-29 11:02:25 -07:00 |
|
Brian Behlendorf
|
729438883f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:19 -07:00 |
|
Brian Behlendorf
|
0ff721ce5d
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-04-29 11:02:17 -07:00 |
|
Brian Behlendorf
|
f8cda0fac8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:11 -07:00 |
|
Brian Behlendorf
|
aebb002361
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-04-29 11:02:09 -07:00 |
|
Brian Behlendorf
|
4236f06629
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:02:04 -07:00 |
|
Brian Behlendorf
|
02daa2aa9f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-04-29 11:02:02 -07:00 |
|
Brian Behlendorf
|
53e436d964
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:56 -07:00 |
|
Brian Behlendorf
|
8f872042d0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 11:01:54 -07:00 |
|
Brian Behlendorf
|
360cb7964b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:49 -07:00 |
|
Brian Behlendorf
|
0461f831ed
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-04-29 11:01:47 -07:00 |
|
Brian Behlendorf
|
dc741831b4
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:41 -07:00 |
|
Brian Behlendorf
|
bf68847fd6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-04-29 11:01:39 -07:00 |
|
Brian Behlendorf
|
feb76cc337
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:33 -07:00 |
|
Brian Behlendorf
|
e46d019df6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-04-29 11:01:31 -07:00 |
|
Brian Behlendorf
|
186b81bd3b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:25 -07:00 |
|
Brian Behlendorf
|
208e42ffe6
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2010-04-29 11:01:23 -07:00 |
|
Brian Behlendorf
|
ea12ca13bf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-04-29 11:01:22 -07:00 |
|
Brian Behlendorf
|
11eb4faced
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:13 -07:00 |
|
Brian Behlendorf
|
f886f90462
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-04-29 11:01:11 -07:00 |
|
Brian Behlendorf
|
683114b605
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:01:05 -07:00 |
|
Brian Behlendorf
|
cb5d1808d5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-04-29 11:01:02 -07:00 |
|
Brian Behlendorf
|
139ca24590
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:00:56 -07:00 |
|
Brian Behlendorf
|
b98d7711a6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2010-04-29 11:00:54 -07:00 |
|
Brian Behlendorf
|
76d877a211
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2010-04-29 11:00:49 -07:00 |
|
Brian Behlendorf
|
2855fbd7a6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2010-04-29 11:00:47 -07:00 |
|
Brian Behlendorf
|
c9ae4b9808
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 11:00:46 -07:00 |
|
Brian Behlendorf
|
8535236dca
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 11:00:45 -07:00 |
|
Brian Behlendorf
|
8e48bbd18a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2010-04-29 11:00:44 -07:00 |
|
Brian Behlendorf
|
72de3a8ee1
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 11:00:44 -07:00 |
|
Brian Behlendorf
|
151f424dd8
|
Strip ident pragma from module/zfs/include/sys/fm/util.h
|
2010-04-29 10:57:17 -07:00 |
|
Brian Behlendorf
|
4d5d0f9ef5
|
Include FMA source and headers in build system
|
2010-04-29 10:55:27 -07:00 |
|
Brian Behlendorf
|
1d93cc144c
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-04-29 10:43:59 -07:00 |