diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:27:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:27:09 -0700 |
| commit | 44f549217cd26daf7063984ae4ee6e46beca9c41 (patch) | |
| tree | 8128955710d052cf2485857e58e616304989b13e /drivers/net/ixgb/ixgb_osdep.h | |
| parent | 3e04767a4647ea6c61ed05abe803c052ce123960 (diff) | |
| parent | 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482 (diff) | |
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: White space cleanup
[PATCH] JFS: return correct error when i-node allocation failed
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Diffstat (limited to 'drivers/net/ixgb/ixgb_osdep.h')
0 files changed, 0 insertions, 0 deletions