Brian Behlendorf
|
19b9be254c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 11:59:40 -08:00 |
|
Brian Behlendorf
|
42b6ca1426
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:59:36 -08:00 |
|
Brian Behlendorf
|
c1b3c9b997
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-10 11:59:34 -08:00 |
|
Brian Behlendorf
|
74beee510d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:59:29 -08:00 |
|
Brian Behlendorf
|
5dac9dc663
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-10 11:59:27 -08:00 |
|
Brian Behlendorf
|
b5a6f81679
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:59:19 -08:00 |
|
Brian Behlendorf
|
07f316588f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-10 11:59:10 -08:00 |
|
Brian Behlendorf
|
cda625cdfa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:59:08 -08:00 |
|
Brian Behlendorf
|
d5c7c0ad86
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:59:07 -08:00 |
|
Brian Behlendorf
|
279bebaa30
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:59:04 -08:00 |
|
Brian Behlendorf
|
449999be3f
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-10 11:59:03 -08:00 |
|
Brian Behlendorf
|
97751ff9d5
|
Fix bad cast
|
2008-12-10 11:54:08 -08:00 |
|
Brian Behlendorf
|
c65368f4fc
|
Add missing frame alignment macros
|
2008-12-10 11:52:18 -08:00 |
|
Brian Behlendorf
|
733155a9a7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:41:11 -08:00 |
|
Brian Behlendorf
|
0ef22717d2
|
Use stack_t defined in /usr/include/bits/sigstack.h
|
2008-12-10 11:39:16 -08:00 |
|
Brian Behlendorf
|
f0b067efff
|
Add frame definitions for x86+x86_64 arches
|
2008-12-10 11:37:45 -08:00 |
|
Brian Behlendorf
|
ac14ee872f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:42 -08:00 |
|
Brian Behlendorf
|
e74b6f3587
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-10 11:33:41 -08:00 |
|
Brian Behlendorf
|
c74b4b9715
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:37 -08:00 |
|
Brian Behlendorf
|
e9e325b044
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-10 11:33:36 -08:00 |
|
Brian Behlendorf
|
9f6c9412ef
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:33 -08:00 |
|
Brian Behlendorf
|
bdac71fd72
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-10 11:33:31 -08:00 |
|
Brian Behlendorf
|
09980544f1
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-10 11:33:28 -08:00 |
|
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 |