diff options
| author | Linus Torvalds | 2006-12-12 16:45:48 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-12-12 16:45:48 +0100 |
| commit | 11c302c14d8ddc47504bd3b650bc9e8da7c717b7 (patch) | |
| tree | 71f39a71ed889df3f3f91420dd2074b134ed0e40 /net/xfrm/xfrm_algo.c | |
| parent | [PATCH] remove unnecessary blk_queue_bounce in SG_IO (diff) | |
| parent | JFS: Fix conflicting superblock flags (diff) | |
| download | kernel-qcow2-linux-11c302c14d8ddc47504bd3b650bc9e8da7c717b7.tar.gz kernel-qcow2-linux-11c302c14d8ddc47504bd3b650bc9e8da7c717b7.tar.xz kernel-qcow2-linux-11c302c14d8ddc47504bd3b650bc9e8da7c717b7.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: Fix conflicting superblock flags
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
0 files changed, 0 insertions, 0 deletions