summaryrefslogtreecommitdiff
path: root/net/irda/irproc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:20:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:20:17 -0700
commit36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad (patch)
tree99e0c131153d2f8126b6bd64e9a2a0e4e68216a0 /net/irda/irproc.c
parent21279cfa107af07ef985539ac0de2152b9cba5f5 (diff)
parentdb8590f5043f3436a65b24155a3a7af2604df876 (diff)
downloadlinux-3.10-36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad.tar.gz
linux-3.10-36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad.tar.bz2
linux-3.10-36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "x86: linker script syntax nits" x86, perf_event: Rename 'performance counter interrupt'
Diffstat (limited to 'net/irda/irproc.c')
0 files changed, 0 insertions, 0 deletions