26cfa9d270
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-29 14:40:26 -07:00
653589b77a
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-06-29 14:40:25 -07:00
39b87a2879
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-06-29 14:40:23 -07:00
cabec2d73c
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-06-29 14:40:22 -07:00
b27a006df9
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-06-29 14:40:20 -07:00
c112aa6055
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-06-29 14:40:19 -07:00
bbe19a8b0e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-29 14:40:17 -07:00
389425ecd7
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-06-29 14:40:16 -07:00
1213402460
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-29 14:40:15 -07:00
731c2d1256
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-06-29 14:40:14 -07:00
b3c82b1b18
Add basic README
...
A simple README with a short summary of the project and a link
directing people to the online documentation.
2010-06-29 14:35:21 -07:00
e689338d50
Remove README
...
This file is being updated, renamed README.markdown, and moved to
the master branch for githubs benefit.
2010-06-29 14:34:13 -07:00
fe14b6802a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 13:43:26 -07:00
82360d2362
Move local variables to heap
...
We were already modifing this function so it would run in the
local development environment, so let's just do the stack fixes
here are well. It's all simple enough.
2010-06-29 13:09:51 -07:00
ba6f4d661c
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 11:37:05 -07:00
ca61a18b4b
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 11:37:03 -07:00
e9fc10ae18
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:57 -07:00
371fdb5cf2
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 11:36:54 -07:00
2a8d4a222b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:49 -07:00
8f412fc1a7
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 11:36:46 -07:00
9334025a81
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:40 -07:00
9f76710853
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-29 11:36:38 -07:00
9921bb4925
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:32 -07:00
b2fa7c143c
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 11:36:30 -07:00
c739e95948
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:24 -07:00
129d7fe78a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 11:36:21 -07:00
3c1022228a
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:15 -07:00
9fddfa2212
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 11:36:13 -07:00
471ad9740e
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:07 -07:00
00a1ab0d45
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-29 11:36:05 -07:00
d112857f2a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:58 -07:00
43088d22ad
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-29 11:35:56 -07:00
beb53b1fd5
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:50 -07:00
b14dd35481
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-29 11:35:48 -07:00
aa8c3e5be7
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:42 -07:00
e197568e59
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-29 11:35:40 -07:00
a6896d0b11
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:33 -07:00
f1de1c960e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 11:35:31 -07:00
e809129f7e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:25 -07:00
36ef3e92c2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-29 11:35:22 -07:00
3256a1be14
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:16 -07:00
8f720e3815
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-29 11:35:14 -07:00
042e369140
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:08 -07:00
dfc2583bcf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 11:35:05 -07:00
d69d0b213d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:59 -07:00
4851f79bf1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 11:34:56 -07:00
f87bfdf6b0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:50 -07:00
eb01fe35c6
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 11:34:48 -07:00
8af57a28ce
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:42 -07:00
5c0cbee2f3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-29 11:34:39 -07:00
Brian Behlendorf