summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2010-09-20Merge remote branch 'irqflags/master'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-config/config'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-llseek/llseek'Stephen Rothwell
2010-09-20Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/usb/gadget/rndis.c
2010-09-20Merge branch 'quilt/tty'Stephen Rothwell
2010-09-20Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/misc/Makefile
2010-09-20Merge remote branch 'workqueues/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: mm/percpu.c
2010-09-20Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-09-20Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: net/core/dev.c
2010-09-20Merge remote branch 'rcu/rcu/next'Stephen Rothwell
2010-09-20Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-09-20Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-09-20Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/sh_mobile_sdhi.c
2010-09-20Merge remote branch 'slab/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-09-20Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2010-09-20Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/smc91c92_cs.c
2010-09-20Merge commit 'refs/next/20100916/block'Stephen Rothwell
Conflicts: block/blk-core.c drivers/block/loop.c
2010-09-20Merge remote branch 'input/next'Stephen Rothwell
2010-09-20Merge remote branch 'sound/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c drivers/video/sh_mobile_hdmi.c
2010-09-20Merge remote branch 'crypto/master'Stephen Rothwell
2010-09-20Merge remote branch 'wireless/master'Stephen Rothwell
2010-09-20Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/pcnet_cs.c
2010-09-20Merge remote branch 'async_tx/next'Stephen Rothwell
2010-09-20Merge remote branch 'scsi/master'Stephen Rothwell
2010-09-20Merge remote branch 'dlm/next'Stephen Rothwell
2010-09-20Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'acpi/test'Stephen Rothwell
2010-09-20Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-09-20Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/IR/ir-keytable.c drivers/media/IR/ir-lirc-codec.c drivers/media/IR/ir-raw-event.c drivers/media/IR/streamzap.c drivers/media/dvb/siano/smscoreapi.c drivers/media/video/s5p-fimc/fimc-core.c
2010-09-20Merge branch 'quilt/i2c'Stephen Rothwell
2010-09-20Merge remote branch 'hid/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'v9fs/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'ocfs2/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'nilfs2/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'nfsd/nfsd-next'Stephen Rothwell
2010-09-20Merge remote branch 'nfs/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'ext4/next'Stephen Rothwell
2010-09-20Merge remote branch 'genesis/master'Stephen Rothwell
2010-09-20Merge remote branch 's390/features'Stephen Rothwell
2010-09-20Merge remote branch 'davinci/davinci-next'Stephen Rothwell
2010-09-20Merge remote branch 'arm/devel'Stephen Rothwell
2010-09-20init.h: add some more documentation to __ref* tagsMichal Nazarewicz
The __ref* tags may have been confusing for new kernel developers (I was confused by them for sure) so adding a few more sentences to comment to clear things up for people who see those for the first time. Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20usb gadget: don't save bind callback in struct usb_configurationUwe Kleine-König
The bind function is most of the time only called at init time so there is no need to save a pointer to it in the configuration structure. This fixes many section mismatches reported by modpost. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [m.nazarewicz@samsung.com: updated for -next] Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20usb gadget: don't save bind callback in struct usb_composite_driverMichal Nazarewicz
The bind function is most of the time only called at init time so there is no need to save a pointer to it in the composite driver structure. This fixes many section mismatches reported by modpost. Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>