summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-24 13:00:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-24 13:00:37 -0800
commitd3c7e1ab043abd7706db4fbccf327df9e62f7990 (patch)
tree793aec926c57da1e364e04163199262364c627b0 /net/irda
parentdfe80f63293ece364795c2e87805882c9ec3a266 (diff)
parent4bdac7da5237170b1392f39ebee99d235043fad8 (diff)
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: spi/mpc52xx-spi: fix annotation for remove()-pointer spi/fsl_espi: fix wrong setting of the address in the command buffer spi/fsl_espi: change the read behaviour of the SPIRF of/i2c: Fix request module by alias powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions