Randy Dunlap ee665ecca6 maple: fix Error in kernel-doc notation ... Fix kernel-doc error in maple (it's not kernel-doc): Error(drivers/sh/maple/maple.c:782): cannot understand prototype: 'struct bus_type maple_bus_type = ' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-03-29 08:12:39 -07:00
..
accessibility
acpi	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
amba
ata	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
atm
auxdisplay
base	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
bluetooth
cdrom
char	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
clocksource	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
edac
eisa	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
firewire
firmware
gpio
gpu	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
hid	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
hwmon
i2c	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-03-28 14:04:53 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-03-26 11:17:04 -07:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-03-27 18:33:56 -07:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
input	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
leds
lguest	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
macintosh
mca
md
media	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
memstick
message
mfd
misc	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-03-28 14:04:53 -07:00
mmc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
mtd	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
net	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
nubus
of
oprofile
parisc
parport
pci	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
pcmcia	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
platform	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
pnp
power
ps3
rapidio
regulator
rtc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
sbus
scsi	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
serial	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
sh	maple: fix Error in kernel-doc notation	2009-03-29 08:12:39 -07:00
sn
spi	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
ssb	b43: Add BCM4307 PCI-ID	2009-03-27 20:13:20 -04:00
staging
tc
telephony
thermal
uio
usb	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
uwb
video	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
virtio
w1
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
xen
zorro
Kconfig
Makefile	ide/net: flip the order of SATA and network init	2009-03-28 13:06:16 -07:00