summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-10 19:58:46 +0300
committerTakashi Iwai <tiwai@suse.de>2008-11-10 19:58:46 +0300
commit6b425660f45cdea177fe95388e081afa947b1506 (patch)
treeb0cc2cb7d86e228da458cd083a113d075541d700 /include
parent7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d (diff)
parent0f101fa6bccdc797ddcee40fd4c55e879155a40f (diff)
parent254248313aed7e6ff295ca21a82ca989b1f69c16 (diff)
downloadlinux-6b425660f45cdea177fe95388e081afa947b1506.tar.xz
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus