Brian Behlendorf
|
e2b71e2cb1
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:22 -07:00 |
|
Brian Behlendorf
|
13f61a6a0f
|
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
|
2010-05-18 11:13:21 -07:00 |
|
Brian Behlendorf
|
0573c9bbdc
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:19 -07:00 |
|
Brian Behlendorf
|
bf37c82d6b
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2010-05-18 11:13:18 -07:00 |
|
Brian Behlendorf
|
12ece159dd
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:16 -07:00 |
|
Brian Behlendorf
|
ea51292b2e
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2010-05-18 11:13:15 -07:00 |
|
Brian Behlendorf
|
5079d27855
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:13 -07:00 |
|
Brian Behlendorf
|
005345854f
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2010-05-18 11:13:12 -07:00 |
|
Brian Behlendorf
|
bbfd3b9120
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:10 -07:00 |
|
Brian Behlendorf
|
fabb9bfad8
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2010-05-18 11:13:09 -07:00 |
|
Brian Behlendorf
|
966c35508b
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:06 -07:00 |
|
Brian Behlendorf
|
754ac0a63b
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2010-05-18 11:13:05 -07:00 |
|
Brian Behlendorf
|
9499452a8a
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:04 -07:00 |
|
Brian Behlendorf
|
52262aec85
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2010-05-18 11:13:02 -07:00 |
|
Brian Behlendorf
|
1487b0c477
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:01 -07:00 |
|
Brian Behlendorf
|
af94be8457
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2010-05-18 11:13:00 -07:00 |
|
Brian Behlendorf
|
29e356ec56
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2010-05-18 11:12:58 -07:00 |
|
Brian Behlendorf
|
914011278b
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2010-05-18 11:12:57 -07:00 |
|
Brian Behlendorf
|
2bda8b952e
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2010-05-18 11:12:55 -07:00 |
|
Brian Behlendorf
|
473c776a88
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2010-05-18 11:12:54 -07:00 |
|
Brian Behlendorf
|
2fc974c544
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2010-05-18 11:12:52 -07:00 |
|
Brian Behlendorf
|
be227ae542
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2010-05-18 11:12:50 -07:00 |
|
Brian Behlendorf
|
94d52d93d9
|
Update COPYRIGHT to include release id LLNL-CODE-403049.
|
2010-05-18 11:06:56 -07:00 |
|
Brian Behlendorf
|
f227867783
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:45:45 -07:00 |
|
Brian Behlendorf
|
86515110eb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-18 10:45:43 -07:00 |
|
Brian Behlendorf
|
e774eb9fcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-18 10:45:43 -07:00 |
|
Brian Behlendorf
|
fbc114b463
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:45:29 -07:00 |
|
Brian Behlendorf
|
27f4e3d188
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-18 10:45:27 -07:00 |
|
Brian Behlendorf
|
328699d4ba
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:45:19 -07:00 |
|
Brian Behlendorf
|
c7243bb1d8
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-18 10:45:17 -07:00 |
|
Brian Behlendorf
|
98f71f80ea
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:45:10 -07:00 |
|
Brian Behlendorf
|
d701d15c2f
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-18 10:45:08 -07:00 |
|
Brian Behlendorf
|
f952da52e0
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:45:00 -07:00 |
|
Brian Behlendorf
|
416e61f14d
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-18 10:44:58 -07:00 |
|
Brian Behlendorf
|
acb808a0b5
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:51 -07:00 |
|
Brian Behlendorf
|
f5a98f229f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-18 10:44:49 -07:00 |
|
Brian Behlendorf
|
45d38b1c29
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:42 -07:00 |
|
Brian Behlendorf
|
6eb6ae0b89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-18 10:44:40 -07:00 |
|
Brian Behlendorf
|
d464422d94
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:33 -07:00 |
|
Brian Behlendorf
|
96c7ccd3c7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-18 10:44:31 -07:00 |
|
Brian Behlendorf
|
0d1b30dcb5
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:24 -07:00 |
|
Brian Behlendorf
|
c2877acb6a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-18 10:44:22 -07:00 |
|
Brian Behlendorf
|
8e9f8e666d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:14 -07:00 |
|
Brian Behlendorf
|
bbfeb1b1f7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-18 10:44:12 -07:00 |
|
Brian Behlendorf
|
fb6b18e1bd
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:44:05 -07:00 |
|
Brian Behlendorf
|
2709afc84e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-05-18 10:44:03 -07:00 |
|
Brian Behlendorf
|
9653218333
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:43:56 -07:00 |
|
Brian Behlendorf
|
1cd5a97fbb
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-18 10:43:54 -07:00 |
|
Brian Behlendorf
|
719d6d4aff
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-18 10:43:46 -07:00 |
|
Brian Behlendorf
|
d844ec944f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-18 10:43:44 -07:00 |