Linus Torvalds 0c93ea4064 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

2009-03-26 11:17:04 -07:00

..

alchemy-flash.c

[MTD] Make alchemy_mtd_init function static

2008-12-10 13:01:10 +00:00

amd76xrom.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

autcpu12-nvram.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

bfin-async-flash.c

[MTD] [MAPS] blackfin: fix memory leak in error path

2009-02-14 08:07:05 +00:00

cdb89712.c

[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants

2008-11-13 15:05:03 +00:00

ceiva.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

cfi_flagadm.c

[MTD] Make init_flagadm function static

2008-12-10 13:01:00 +00:00

ck804xrom.c

[MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver.

2009-02-27 04:52:45 +09:00

dbox2-flash.c

[MTD] Make init_dbox2_flash static

2008-12-10 13:01:02 +00:00

dc21285.c

[ARM] netwinder: clean up GPIO naming

2008-12-13 09:12:07 +00:00

dilnetpc.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

dmv182.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

edb7312.c

[MTD] Make the init_edb7312nor function static

2008-12-10 13:00:51 +00:00

esb2rom.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

fortunet.c

[MTD] Make init_fortunet function static

2008-12-10 13:01:13 +00:00

h720x-flash.c

[MTD] Make h720x_mtd_init function static

2008-12-10 13:01:23 +00:00

ichxrom.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

impa7.c

[MTD] Make init_impa7 static

2008-12-10 13:01:32 +00:00

integrator-flash.c

[MTD] struct device - replace bus_id with dev_name(), dev_set_name()

2008-12-23 10:00:14 +00:00

intel_vr_nor.c

[MTD] map driver for NOR flash on the Intel Vermilion Range chipset

2007-09-23 18:51:25 +01:00

ipaq-flash.c

[MTD] Make ipaq_mtd_init function static

2008-12-10 13:01:06 +00:00

ixp4xx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-01-05 10:50:33 +01:00

ixp2000.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-01-05 10:50:33 +01:00

Kconfig

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

l440gx.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

Makefile

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

map_funcs.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mbx860.c

[MTD] Make init_mbx function static

2008-12-10 13:01:20 +00:00

netsc520.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

nettel.c

[MTD] [MAPS] Fix printk format warning in nettel.c

2009-01-09 14:17:50 +00:00

octagon-5066.c

[MTD] Make init_oct5066 function static

2008-12-10 13:00:56 +00:00

omap_nor.c

[MTD] struct device - replace bus_id with dev_name(), dev_set_name()

2008-12-23 10:00:14 +00:00

pci.c

[MTD] [MAPS] Remove unused variable after ROM API cleanup.

2008-10-14 11:00:51 +01:00

pcmciamtd.c

pcmcia: remove unused argument to pcmcia_parse_tuple()

2008-08-31 15:50:33 +02:00

physmap_of.c

[MTD] struct device - replace bus_id with dev_name(), dev_set_name()

2008-12-23 10:00:14 +00:00

physmap.c

mtd: physmap: fix NULL pointer dereference in error path

2009-03-10 15:55:11 -07:00

plat-ram.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

pmcmsp-flash.c

[MTD] Make init_msp_flash function static

2008-12-10 13:01:26 +00:00

pmcmsp-ramroot.c

…

pxa2xx-flash.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

redwood.c

[MTD] Make init_redwood_flash function static

2008-12-10 13:01:29 +00:00

rpxlite.c

[MTD] Make init_rpxlite function static

2008-12-10 13:00:43 +00:00

sa1100-flash.c

rename platform_driver name "flash" to "sa1100-mtd"

2009-01-31 01:21:58 +01:00

sbc8240.c

[MTD] Make init_sbc8240_mtd function static

2008-12-10 13:00:23 +00:00

sbc_gxx.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

sc520cdp.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

scb2_flash.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

scx200_docflash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

sharpsl-flash.c

[MTD] Make init_sharpsl symbol static

2008-12-10 13:00:11 +00:00

solutionengine.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

sun_uflash.c

sparc: Annotate of_device_id arrays with const or __initdata.

2008-08-31 01:23:17 -07:00

tqm8xxl.c

[MTD] Make init_tqm_mtd function static

2008-12-10 13:00:37 +00:00

ts5500_flash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

tsunami_flash.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

uclinux.c

[MTD] Make uclinux_mtd_cleanup and uclinux_mtd_init static

2008-12-10 13:00:33 +00:00

vmax301.c

[MTD] Make the function init_vmax301 static

2008-12-10 13:01:17 +00:00

vmu-flash.c

mtd: flash mapping support for Dreamcast VMU.

2009-03-10 18:03:02 +09:00

wr_sbc82xx_flash.c

[MTD] Make init_sbc82xx_flash function static

2008-12-10 13:00:47 +00:00