diff options
| author | Linus Torvalds <[email protected]> | 2008-04-18 15:37:19 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-04-18 15:37:19 +0000 |
| commit | 4adeaaf51ebcc3f629f5512b96aebb5089388bca (patch) | |
| tree | ce582d13c76b985d659b46b678d280f915bd8427 /net/unix/sysctl_net_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb (diff) | |
| parent | jfs: replace __inline with inline (diff) | |
| download | kernel-4adeaaf51ebcc3f629f5512b96aebb5089388bca.tar.gz kernel-4adeaaf51ebcc3f629f5512b96aebb5089388bca.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: replace __inline with inline
jfs: le*_add_cpu conversion
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions