summaryrefslogtreecommitdiffstats
path: root/include/net/llc_s_st.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 03:29:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 03:29:05 +0100
commitd5ed5e48f4a6333cde05c5235b88a8a94e72afe8 (patch)
tree270824153a912b24b6402ad7e18658b54be4a643 /include/net/llc_s_st.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sam... (diff)
parentALSA: atmel/ac97c: using software reset instead hardware reset if not available (diff)
downloadlinux-d5ed5e48f4a6333cde05c5235b88a8a94e72afe8.tar.xz
linux-d5ed5e48f4a6333cde05c5235b88a8a94e72afe8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: atmel/ac97c: using software reset instead hardware reset if not available
Diffstat (limited to 'include/net/llc_s_st.h')
0 files changed, 0 insertions, 0 deletions