diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 20:43:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 20:43:21 -0400 |
| commit | 1fca25427482387689fa27594c992a961d98768f (patch) | |
| tree | 7b152866f3ee7cd71adb22697fe2a798e824b19d /drivers/net/tun.c | |
| parent | b689e83961e6b2e39bf378c1468fd7d7a924656c (diff) | |
| parent | 37c23e7fda6913d133ac12012395e58af1fe24c6 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] use generic compat_old_sys_readdir
[IA64] pci_acpi_scan_root cleanup
[IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
[IA64] Remove sn2_defconfig.
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions