summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx/include/mach/vmalloc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 20:40:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 20:40:24 +0200
commit3f4a12210774eb31c3435a5bc21d57aa20647aeb (patch)
tree9a09e4717969f755c22071cc306ec253d2ecc0e3 /arch/arm/mach-lpc32xx/include/mach/vmalloc.h
parentMerge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block (diff)
parenti2c: Allow i2c_add_numbered_adapter() to assign a bus id (diff)
downloadlinux-3f4a12210774eb31c3435a5bc21d57aa20647aeb.tar.xz
linux-3f4a12210774eb31c3435a5bc21d57aa20647aeb.zip
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Allow i2c_add_numbered_adapter() to assign a bus id i2c-ali1535: Fix style issues
Diffstat (limited to 'arch/arm/mach-lpc32xx/include/mach/vmalloc.h')
0 files changed, 0 insertions, 0 deletions