summaryrefslogtreecommitdiffstats
path: root/fs/quota/quotaio_v2.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 19:10:51 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 19:10:51 +0200
commit09cefbb605ccb07c65f313253268a634e0dcd283 (patch)
treee7be04bdf5dca8c3e2205f44f06b8f09b99bb025 /fs/quota/quotaio_v2.h
parentMerge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/l... (diff)
parentMerge branch 'fix/asoc' into for-linus (diff)
downloadlinux-09cefbb605ccb07c65f313253268a634e0dcd283.tar.xz
linux-09cefbb605ccb07c65f313253268a634e0dcd283.zip
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: (26 commits) ASoC: Fix power down for widgetless per-card DAPM context case ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT ASoC: Remove duplicate linux/delay.h inclusion. ASoC: sam9g20_wm8731: use the proper SYSCKL value ASoC: wm8731: fix wm8731_check_osc() connected condition ALSA: hda - Reorganize controller quriks with bit flags ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config() ALSA: core: remove unused variables. ALSA: HDA: Increase MAX_HDMI_PINS ALSA: PCM - Don't check DMA time-out too shortly MAINTAINERS: add FireWire audio maintainer ALSA: usb-audio: more control quirks for M-Audio FastTrack devices ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER ALSA: usb-audio: export snd_usb_feature_unit_ctl ALSA: usb-audio: rework add_control_to_empty() ALSA: usb-audio: move assignment of chip->ctrl_intf ALSA: hda - Use model=auto for Lenovo G555 ALSA: HDA: Unify HDMI hotplug handling. ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe ASoC: core - remove superfluous new line. ...
Diffstat (limited to 'fs/quota/quotaio_v2.h')
0 files changed, 0 insertions, 0 deletions