Commit Graph

1841 Commits

Author SHA1 Message Date
Brian Behlendorf c889e50d1f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-10 12:00:52 -08:00
Brian Behlendorf 5c887c65f6 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:49 -08:00
Brian Behlendorf 2db09f9c6b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-10 12:00:47 -08:00
Brian Behlendorf a36365feb6 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:43 -08:00
Brian Behlendorf 2d658f2d9d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-10 12:00:41 -08:00
Brian Behlendorf d4fe007d94 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:37 -08:00
Brian Behlendorf bf280fb033 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-10 12:00:36 -08:00
Brian Behlendorf f48ff68ac1 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:32 -08:00
Brian Behlendorf 2aac31bb0a Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-10 12:00:30 -08:00
Brian Behlendorf eeceb7c595 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:26 -08:00
Brian Behlendorf 1d3770b4b7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-10 12:00:24 -08:00
Brian Behlendorf 54a3ab135a Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:21 -08:00
Brian Behlendorf 2eb6fa8f1c Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-10 12:00:19 -08:00
Brian Behlendorf be970e80d8 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:16 -08:00
Brian Behlendorf 5cb66ff8d5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-10 12:00:14 -08:00
Brian Behlendorf deeb049ae2 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-10 12:00:13 -08:00
Brian Behlendorf b8aeade61b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-10 12:00:07 -08:00
Brian Behlendorf 52e89fea46 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-10 12:00:05 -08:00
Brian Behlendorf e3b2a16cc7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-10 12:00:04 -08:00
Brian Behlendorf c38b16e2ee Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-10 11:59:58 -08:00
Brian Behlendorf 8ef9f63243 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-10 11:59:57 -08:00
Brian Behlendorf 04977ac542 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-10 11:59:52 -08:00
Brian Behlendorf 8dcc619acb Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-10 11:59:51 -08:00
Brian Behlendorf b5d1b571d6 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-10 11:59:47 -08:00
Brian Behlendorf 65bceaba2a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-10 11:59:46 -08:00
Brian Behlendorf 4280da731d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-10 11:59:42 -08:00
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