diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 09:26:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 09:26:53 -0700 |
| commit | 8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec (patch) | |
| tree | 67982a268cc4573aba1df10725019418b207d442 /mm/swapfile.c | |
| parent | 6e139047e2eecd0ccf8bc2f1564e82747cb6e56c (diff) | |
| parent | 4f3c7a18d9e8a287d31f828a259d713fe4859471 (diff) | |
| download | linux-8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size
ALSA: hdspm - Fix compile warnings with PPC
ALSA: cs5535 - Fix invalid big-endian conversions
ALSA: HDMI - fix ELD monitor name length
ALSA: atmel - update author email for ABDAC, AC97C and AT73C213
ALSA: HDA: Add model=auto quirk for Acer Aspire 3830TG
ALSA: HDA: Add a new Conexant codec ID (506c)
Diffstat (limited to 'mm/swapfile.c')
0 files changed, 0 insertions, 0 deletions