b19e8f7318
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-05 09:34:04 -08:00
3dce9c0ff7
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2008-12-05 09:34:03 -08:00
e9f74d2295
New TopGit dependency: gcc-init-pragmas
2008-12-05 09:34:02 -08:00
74fbfae8f4
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2008-12-05 09:33:58 -08:00
1603500d7d
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-05 09:33:58 -08:00
dd5ae6bf8b
New TopGit dependency: gcc-debug
2008-12-05 09:33:57 -08:00
d5db5d6416
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-05 09:33:52 -08:00
7e27dd328e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-05 09:33:51 -08:00
139bc84e9a
New TopGit dependency: gcc-cast
2008-12-05 09:33:50 -08:00
6c97558f3f
Refresh gcc-branch
2008-12-05 09:33:44 -08:00
96dd9f20c3
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-12-04 14:41:57 -08:00
d89462d075
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-12-04 14:41:26 -08:00
8de21aeeef
Refresh gcc-cast branch
2008-12-04 14:41:11 -08:00
b2b57f4a8a
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-03 16:59:30 -08:00
96072c88e2
Add userspace zfs_context file
2008-12-03 15:43:56 -08:00
b128c09fbe
Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking
2008-12-03 12:09:06 -08:00
be1242a56a
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-12-02 08:53:29 -08:00
264f09c323
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-02 08:53:13 -08:00
56301526c2
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-12-02 08:52:43 -08:00
b6097ae55a
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
2008-12-02 08:47:21 -08:00
9ac0ad5671
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-12-01 16:18:09 -08:00
3f0b1cf687
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-01 16:17:50 -08:00
15003316a0
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-12-01 16:17:08 -08:00
7ebbc0c799
Finish removing all non-upstream bits from master
2008-12-01 16:15:29 -08:00
f0f8b2ccce
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-12-01 15:56:54 -08:00
3d325597ff
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-01 15:56:43 -08:00
2664929dc3
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-12-01 15:56:23 -08:00
ef76e2f5ea
Removed build system from master branch, will relocate to linux-zfs-branch
2008-12-01 15:41:33 -08:00
42baae9615
Removed build system from master branch, will relocate to linux-zfs-branch
2008-12-01 15:38:41 -08:00
fe441a9050
Relocate COPYING+COPYRIGHT, remove README cruft
2008-12-01 15:34:53 -08:00
ef2e1711d2
Add CDDL license file
2008-12-01 14:49:34 -08:00
34121c06f7
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 15:51:15 -08:00
756021703c
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 15:51:07 -08:00
d56ec4d205
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 15:50:48 -08:00
100eb88b46
Update zpios for trivial workload
2008-11-26 15:48:14 -08:00
006bec031e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 15:35:39 -08:00
11a1da8cd8
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 15:35:29 -08:00
728faff8de
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 15:35:11 -08:00
62b749c8c8
Working version of M4 macro config
2008-11-26 15:32:39 -08:00
76f3d410db
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 14:32:51 -08:00
a8b7b60e94
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 14:32:41 -08:00
3e7c39af11
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 14:32:23 -08:00
f0e648ca02
Make everything a M4 macro, it's just cleaner that way
2008-11-26 14:29:45 -08:00
97a6eed121
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 14:10:15 -08:00
ced6ff53b4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 14:10:06 -08:00
ae41739604
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 14:09:48 -08:00
e833fd4a5c
Additional buidl system cleanup. Starting to move all
...
of the kernel specific build info in to config/kernel,
likewise and user specific build flags should go in
config/user. This seems like a reasonable way to go.
2008-11-26 14:06:23 -08:00
0ba35bfd83
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 13:31:43 -08:00
0df0c98a70
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 13:31:34 -08:00
a428fedd3a
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 13:31:16 -08:00
Brian Behlendorf