#
b51e8293 |
| 05-Mar-2010 |
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
rtc-pcf2123: move pcf2123_remove to .devexit.text
The function pcf2123_remove is used only wrapped by __devexit_p so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@peng
rtc-pcf2123: move pcf2123_remove to .devexit.text
The function pcf2123_remove is used only wrapped by __devexit_p so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Cc: Christian Pellegrin <chripell@fsfe.org> Cc: Chris Verges <chrisv@cyberswitching.com> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
Revision tags: v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1 |
|
#
6548698f |
| 07-Dec-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date with 2.6.32. Although no conflicting changes were made in between, it gives benchm
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date with 2.6.32. Although no conflicting changes were made in between, it gives benchmarking results closer to the lastest kernel behaviour.
show more ...
|
Revision tags: v2.6.32 |
|
#
83863243 |
| 01-Dec-2009 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
Revision tags: v2.6.32-rc8 |
|
#
46557bef |
| 18-Nov-2009 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
|
Revision tags: v2.6.32-rc7, v2.6.32-rc6 |
|
#
7a53c7f5 |
| 03-Nov-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.32-rc5' into for-linus
|
#
e87a3dd3 |
| 01-Nov-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
|
#
0b9e31e9 |
| 25-Oct-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Conflicts: fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
0f8f86c7 |
| 18-Oct-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile
Merge reason: We need to be uptodate with the perf events
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile
Merge reason: We need to be uptodate with the perf events development branch because we plan to rewrite the breakpoints API on top of perf events.
show more ...
|
Revision tags: v2.6.32-rc5, v2.6.32-rc4 |
|
#
d94e5fcb |
| 06-Oct-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'v2.6.32-rc3'
|
#
907bc6c7 |
| 06-Oct-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.32' into for-2.6.33
|
#
d9b2002c |
| 06-Oct-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.32-rc3 |
|
#
0aa73ba1 |
| 01-Oct-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up latest fixes and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
1669b049 |
| 29-Sep-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
Revision tags: v2.6.32-rc1, v2.6.32-rc2 |
|
#
8b3f6af8 |
| 25-Sep-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/st
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
show more ...
|
#
baea7b94 |
| 24-Sep-2009 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin' into for-linus
Conflicts: MAINTAINERS
|
#
d2ff6de5 |
| 24-Sep-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
d7a4b414 |
| 23-Sep-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'linus/master' into tracing/kprobes
Conflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.c
Merge reason: Sync with late
Merge commit 'linus/master' into tracing/kprobes
Conflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.c
Merge reason: Sync with latest significant tracing core changes.
show more ...
|
#
f3d2570a |
| 23-Sep-2009 |
Chris Verges <chrisv@cyberswitching.com> |
rtc-philips-pcf2123-rtc-spi-driver-updates
Signed-off: Chris Verges <chrisv@cyberswitching.com> Cc: Christian Pellegrin <chripell@fsfe.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brow
rtc-philips-pcf2123-rtc-spi-driver-updates
Signed-off: Chris Verges <chrisv@cyberswitching.com> Cc: Christian Pellegrin <chripell@fsfe.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
#
7f3923a1 |
| 23-Sep-2009 |
Chris Verges <chrisv@cyberswitching.com> |
rtc: Philips PCF2123 RTC SPI driver
Add support for the Philips/NXP PCF2123 RTC.
Signed-off: Chris Verges <chrisv@cyberswitching.com> Tested-by: Chris Verges <chrisv@cyberswitching.com> Signed-off:
rtc: Philips PCF2123 RTC SPI driver
Add support for the Philips/NXP PCF2123 RTC.
Signed-off: Chris Verges <chrisv@cyberswitching.com> Tested-by: Chris Verges <chrisv@cyberswitching.com> Signed-off: Christian Pellegrin <chripell@fsfe.org> Tested-by: Christian Pellegrin <chripell@fsfe.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|