Linus Torvalds
32aaeffbd4
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ...
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
2011-10-23 14:42:30 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 19:55:06 -07:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-09-20 15:57:39 -07:00
2011-09-20 15:57:39 -07:00
2011-11-01 21:08:03 -07:00
2011-11-02 02:46:10 +01:00
2011-11-01 13:47:27 +01:00
2011-11-02 02:46:10 +01:00
2011-11-01 13:47:27 +01:00
2011-11-03 09:40:51 -07:00
2011-11-06 19:44:47 -08:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-09-21 16:07:45 +01:00
2011-05-26 12:11:54 -07:00
2011-11-01 13:47:27 +01:00
2011-11-01 13:47:27 +01:00
2011-07-04 04:11:08 -07:00
2011-05-31 06:17:02 -07:00
2011-07-04 18:44:02 +03:00
2011-11-01 13:47:27 +01:00
2011-03-07 20:02:13 -07:00
2011-03-07 20:02:05 -07:00
2010-12-21 21:05:14 -07:00
2011-03-07 20:02:21 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 21:05:14 -07:00
2011-05-13 07:08:18 -07:00
2011-02-16 17:49:35 -08:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 20:03:12 -07:00
2010-02-24 17:45:15 -07:00
2011-03-09 18:44:28 -07:00
2011-09-21 15:50:31 -07:00
2011-02-25 16:10:42 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:04:03 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2010-02-24 12:16:15 -07:00
2011-09-21 15:50:31 -07:00
2011-07-09 19:14:46 -06:00
2011-09-21 15:50:31 -07:00
2011-09-21 15:50:31 -07:00
2010-12-21 20:01:55 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:21:17 -07:00
2011-07-26 17:42:18 -07:00
2011-07-10 05:57:06 -06:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-11-06 19:44:47 -08:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-09-14 16:01:21 -06:00
2011-07-09 19:15:05 -06:00
2011-07-09 19:15:05 -06:00
2011-04-20 12:43:56 -06:00
2011-03-07 20:02:13 -07:00
2010-12-21 21:05:14 -07:00
2011-07-10 05:56:30 -06:00
2011-03-07 20:02:57 -07:00
2010-12-21 21:05:15 -07:00
2011-07-26 17:09:31 -07:00
2010-12-21 20:01:55 -07:00
2011-07-10 05:56:32 -06:00
2011-08-10 02:20:43 -07:00
2011-07-04 18:43:27 +03:00
2011-07-04 18:43:27 +03:00
2011-10-19 16:34:11 -07:00
2011-10-19 16:34:11 -07:00
2011-06-24 09:54:31 +01:00
2011-05-20 17:15:54 +02:00
2011-11-01 20:58:25 -07:00
2011-03-22 04:53:42 -03:00
2011-11-06 19:44:47 -08:00
2011-10-04 09:52:23 -07:00
2011-01-06 19:13:58 -08:00
2011-02-25 16:10:17 -07:00
2010-12-21 21:05:14 -07:00
2010-02-15 09:27:05 -08:00
2011-10-04 09:52:23 -07:00
2011-06-29 01:11:37 -07:00
2011-10-31 19:30:45 -04:00
2011-05-12 02:52:06 -07:00
2011-05-12 02:52:06 -07:00
2011-03-29 14:47:57 +02:00
2011-10-31 23:25:41 +01:00
2011-06-01 02:25:04 -07:00
2011-11-03 08:05:35 -07:00
2011-07-10 05:27:16 -06:00
2011-09-14 17:23:39 -06:00
2011-11-01 20:22:01 -07:00
2011-10-19 16:34:10 -07:00
2011-08-26 11:46:01 +02:00
2011-10-03 11:46:49 -07:00
2011-11-03 09:40:51 -07:00
2011-03-10 18:54:14 -08:00
2011-11-01 20:22:01 -07:00
2011-10-17 09:12:40 +01:00
2011-10-04 09:52:23 -07:00
2011-01-06 19:58:28 -08:00
2009-12-11 16:16:33 -08:00
2011-06-01 02:25:04 -07:00
2010-11-17 12:01:52 +01:00
2010-11-17 12:01:54 +01:00
2010-07-05 16:31:36 +03:00
2010-11-17 12:01:54 +01:00
2011-03-31 11:26:23 -03:00
2011-08-10 04:53:28 -07:00
2011-06-01 02:25:04 -07:00
2011-06-16 05:42:09 -07:00
2011-03-09 16:38:36 -08:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-11-01 20:22:01 -07:00
2011-11-01 20:18:05 -07:00
2011-09-21 15:50:31 -07:00
2011-09-21 15:50:31 -07:00
2011-07-09 19:14:07 -06:00
2011-07-09 19:14:08 -06:00
2011-09-14 17:23:19 -06:00
2011-10-04 22:29:38 +02:00
2011-09-24 13:28:57 +05:30
2011-09-24 13:28:57 +05:30
2011-09-24 13:28:57 +05:30
2011-03-10 22:17:45 -07:00
2011-06-01 02:25:04 -07:00
2011-09-15 12:09:37 -07:00
2011-03-09 16:38:36 -08:00
2010-12-20 15:09:10 +00:00
2011-07-04 15:08:06 +03:00
2011-11-01 20:58:25 -07:00
2011-01-27 16:39:40 -08:00
2011-03-11 09:39:58 -08:00
2011-03-11 09:39:58 -08:00
2010-01-08 15:23:15 -07:00
2010-01-08 15:23:15 -07:00
2011-09-15 16:35:47 -07:00
2011-08-26 16:14:25 -07:00
2011-09-16 09:44:50 -07:00
2011-05-03 02:38:03 -07:00
2011-06-29 04:45:16 -07:00
2011-11-06 19:44:47 -08:00
2011-07-25 12:38:42 -07:00
2011-09-15 11:39:10 -07:00
2010-12-21 21:05:16 -07:00
2011-09-14 17:20:44 -06:00
2011-09-15 11:39:10 -07:00
2011-09-15 11:39:10 -07:00
2011-09-15 11:39:10 -07:00
2010-12-21 21:05:16 -07:00
2011-09-15 11:39:10 -07:00
2011-09-15 11:39:10 -07:00
2011-09-15 11:39:10 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 21:05:14 -07:00
2011-07-09 19:15:06 -06:00
2011-03-02 17:11:18 -08:00
2011-11-06 19:44:47 -08:00
2011-09-15 12:02:07 -07:00
2011-09-15 12:02:07 -07:00
2011-09-15 12:02:07 -07:00
2011-09-15 12:02:07 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2011-07-08 02:18:24 -07:00
2010-12-21 20:01:55 -07:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2010-12-21 20:01:54 -07:00
2009-11-22 10:24:33 -08:00
2009-10-20 09:40:47 -07:00
2010-12-17 15:13:46 -08:00
2010-12-17 15:13:44 -08:00
2010-02-17 17:23:20 -08:00
2009-10-20 09:40:47 -07:00
2010-12-21 21:05:14 -07:00
2011-10-19 16:34:11 -07:00
2010-12-21 14:45:56 -08:00
2011-10-04 09:52:23 -07:00
2011-02-04 14:26:08 +00:00
2011-06-30 08:47:35 +01:00
2011-09-15 12:09:21 -07:00
2011-11-01 20:22:01 -07:00
2011-03-07 20:05:08 -07:00
2011-11-01 20:22:01 -07:00
2011-03-17 19:28:15 -07:00
2011-02-04 14:26:08 +00:00
2011-02-04 14:26:08 +00:00
2011-02-23 17:54:55 +00:00
2011-10-04 09:47:06 -07:00
2011-09-30 16:16:12 +03:00
2011-07-04 18:43:43 +03:00
2010-10-08 11:40:20 -06:00
2011-03-01 17:02:44 +02:00
2011-10-04 09:52:23 -07:00
2011-10-31 19:30:50 -04:00
2011-09-15 12:09:22 -07:00
2011-09-15 12:09:22 -07:00
2011-09-15 12:09:22 -07:00
2011-09-15 12:09:22 -07:00
2011-11-06 19:44:47 -08:00
2011-09-21 09:36:21 -07:00
2011-09-15 11:39:10 -07:00
2011-09-15 12:09:21 -07:00
2011-09-15 12:09:21 -07:00
2011-09-15 12:09:08 -07:00
2011-09-15 12:09:08 -07:00
2011-09-15 12:09:08 -07:00
2011-09-15 12:09:08 -07:00
2011-01-06 19:58:28 -08:00
2010-12-21 19:56:17 -07:00
32aaeffbd4