Brian Behlendorf
|
894a9fefdd
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-10 11:33:27 -08:00 |
|
Brian Behlendorf
|
eea187d511
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:23 -08:00 |
|
Brian Behlendorf
|
060926a225
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-10 11:33:22 -08:00 |
|
Brian Behlendorf
|
ec70509f14
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:18 -08:00 |
|
Brian Behlendorf
|
67114b5804
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-10 11:33:17 -08:00 |
|
Brian Behlendorf
|
d98b9ce2ce
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:14 -08:00 |
|
Brian Behlendorf
|
2ff46f1245
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-10 11:33:12 -08:00 |
|
Brian Behlendorf
|
c05a5eea2a
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:09 -08:00 |
|
Brian Behlendorf
|
bc8b1d5fcc
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-10 11:33:08 -08:00 |
|
Brian Behlendorf
|
3c1be21af7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:04 -08:00 |
|
Brian Behlendorf
|
f1a8765c60
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-10 11:33:03 -08:00 |
|
Brian Behlendorf
|
b858ad2583
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:59 -08:00 |
|
Brian Behlendorf
|
df66031b1e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-10 11:32:58 -08:00 |
|
Brian Behlendorf
|
9e2121da5d
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:55 -08:00 |
|
Brian Behlendorf
|
6ad960283c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 11:32:54 -08:00 |
|
Brian Behlendorf
|
fe0f75b01e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 11:32:53 -08:00 |
|
Brian Behlendorf
|
fec67e222f
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:47 -08:00 |
|
Brian Behlendorf
|
fb52f08b75
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-10 11:32:46 -08:00 |
|
Brian Behlendorf
|
2cc6785050
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-10 11:32:45 -08:00 |
|
Brian Behlendorf
|
6bd2d985b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:39 -08:00 |
|
Brian Behlendorf
|
daf1a5cf2e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 11:32:38 -08:00 |
|
Brian Behlendorf
|
1631428034
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:35 -08:00 |
|
Brian Behlendorf
|
d33f6401cf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-10 11:32:33 -08:00 |
|
Brian Behlendorf
|
252ff5aac8
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:30 -08:00 |
|
Brian Behlendorf
|
ab492125a1
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-10 11:32:29 -08:00 |
|
Brian Behlendorf
|
7b1939e4a3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:25 -08:00 |
|
Brian Behlendorf
|
b79eb2bab6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 11:32:24 -08:00 |
|
Brian Behlendorf
|
10568085e6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:21 -08:00 |
|
Brian Behlendorf
|
a7a6e6ec97
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-10 11:32:19 -08:00 |
|
Brian Behlendorf
|
b0ff0505ff
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:16 -08:00 |
|
Brian Behlendorf
|
cd7d4000d9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-10 11:32:15 -08:00 |
|
Brian Behlendorf
|
f51ddc96b5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:32:11 -08:00 |
|
Brian Behlendorf
|
99bbc55b14
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-10 11:32:10 -08:00 |
|
Brian Behlendorf
|
486d7cac03
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:32:09 -08:00 |
|
Brian Behlendorf
|
7baad04134
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
c0fd117de8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
b910a84f6e
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-10 11:32:07 -08:00 |
|
Brian Behlendorf
|
6d4310200c
|
Fix two missing voids in prototypes
|
2008-12-10 11:30:12 -08:00 |
|
Brian Behlendorf
|
019bdbbdc1
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-10 11:20:30 -08:00 |
|
Brian Behlendorf
|
338bafda1d
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-10 11:20:29 -08:00 |
|
Brian Behlendorf
|
23aea27d0f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:20:28 -08:00 |
|
Brian Behlendorf
|
dd3f56983d
|
Add stack_getbounds() and thr_stksegment() interfaces
|
2008-12-10 11:18:37 -08:00 |
|
Brian Behlendorf
|
6f9c9e8ea3
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-10 09:36:10 -08:00 |
|
Brian Behlendorf
|
c539079c82
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-10 09:36:09 -08:00 |
|
Brian Behlendorf
|
be0b7d7f7a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 09:36:08 -08:00 |
|
Brian Behlendorf
|
e0231ea639
|
Fix typo in header
|
2008-12-10 09:34:19 -08:00 |
|
Brian Behlendorf
|
04e08c9302
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-10 09:32:40 -08:00 |
|
Brian Behlendorf
|
43c3b43a01
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-10 09:32:38 -08:00 |
|
Brian Behlendorf
|
c692252457
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 09:32:37 -08:00 |
|
Brian Behlendorf
|
0b519593ac
|
Move thread.h to the correct place
|
2008-12-10 09:30:34 -08:00 |