Commit Graph

3013 Commits

Author SHA1 Message Date
Brian Behlendorf 88de88c1b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 11:07:07 -08:00
Brian Behlendorf 1cb6a4e6e7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 11:06:59 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf 8166d4835a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:59:26 -08:00
Brian Behlendorf fbb5c2ca7c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:59:26 -08:00
Brian Behlendorf 4d54aed828 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:59:19 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf ad8923316f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:44:56 -08:00
Brian Behlendorf d26d53fafc Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:44:55 -08:00
Brian Behlendorf 3b0ebda451 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:44:49 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf 07f84cad28 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:38:11 -08:00
Brian Behlendorf 1cce2945a5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:38:10 -08:00
Brian Behlendorf 7eb016ef42 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:38:04 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf d1b07069fa Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:29:57 -08:00
Brian Behlendorf 3fa572fe20 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:29:56 -08:00
Brian Behlendorf 409daa686f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:29:50 -08:00
Brian Behlendorf f429331a49 Remove redundant build options 2008-12-12 10:27:10 -08:00
Brian Behlendorf 9d9a72e422 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:18:20 -08:00
Brian Behlendorf a25da53921 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:18:19 -08:00
Brian Behlendorf 796cb52da5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:18:13 -08:00
Brian Behlendorf 2d5777f9a7 Use AM_CFLAGS 2008-12-12 10:15:59 -08:00
Brian Behlendorf 6280a6f17b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 10:12:39 -08:00
Brian Behlendorf d4bd8c42a5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 10:12:38 -08:00
Brian Behlendorf 4846b5850f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:12:32 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 29d5998baf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 09:22:55 -08:00
Brian Behlendorf f2dc02c87c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 09:22:55 -08:00
Brian Behlendorf 8516e2d45e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 09:22:48 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 20e4845d0f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-12 08:52:50 -08:00
Brian Behlendorf 87b4b8b8b7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-12 08:52:49 -08:00
Brian Behlendorf 86b3bb18c3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 08:52:43 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf d2c1da93ba Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 16:56:10 -08:00
Brian Behlendorf d1298845df Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 16:56:08 -08:00
Brian Behlendorf 9ddda584c8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 16:55:55 -08:00
Brian Behlendorf f55d6ad125 Remove bugus checks for now 2008-12-11 16:51:09 -08:00
Brian Behlendorf 531ffc59df Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 16:34:15 -08:00
Brian Behlendorf 5332504adb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 16:34:13 -08:00
Brian Behlendorf c95fabb9c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 16:33:58 -08:00
Brian Behlendorf e4fae8e3d4 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf 2308a268a5 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 15:41:51 -08:00
Brian Behlendorf eefa9ab3ab Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 12389cbaaf Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 843ecec587 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 15:41:50 -08:00
Brian Behlendorf a557668285 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 15:41:49 -08:00
Brian Behlendorf 9e0b8ff76f Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00