diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 12:56:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 12:56:12 -0800 |
| commit | 647df5189fecb2c2fa811421a3f28bf9034e3a70 (patch) | |
| tree | f3fac52eedac2bb74a760a798ea8c397e2878553 /net/9p/protocol.c | |
| parent | cbbc49877d44408c4d0decf77c3c141732bbc679 (diff) | |
| parent | 175add1981e53d22caba8f42d5f924a4de507b6c (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] SN specific version of dma_get_required_mask()
[IA64] generic_defconfig: Enable SATA_VITESSE
[IA64] dump stack on kernel unaligned warnings
[IA64] Turn on CONFIG_HAVE_UNSTABLE_CLOCK
[IA64] Update to use account_{steal,idle}_ticks
Diffstat (limited to 'net/9p/protocol.c')
0 files changed, 0 insertions, 0 deletions