summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2010-12-10Merge remote branch 'tty/tty-next'Stephen Rothwell
2010-12-10Merge remote branch 'driver-core/driver-core-next'Stephen Rothwell
2010-12-10Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/apic/nmi.c
2010-12-10Merge remote branch 'rcu/rcu/next'Stephen Rothwell
2010-12-10Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-12-10Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig
2010-12-10Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-12-10Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: MAINTAINERS drivers/scsi/bfa/bfa_fcpim.c
2010-12-10Merge remote branch 'selinux/master'Stephen Rothwell
2010-12-10Merge remote branch 'security-testing/next'Stephen Rothwell
2010-12-10Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/core.c
2010-12-10Merge remote branch 'fbdev/master'Stephen Rothwell
2010-12-10Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-12-10Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/wm8994-core.c
2010-12-10Merge remote branch 'slab/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2010-12-10Merge remote branch 'battery/master'Stephen Rothwell
2010-12-10Merge remote branch 'input/next'Stephen Rothwell
2010-12-10Merge remote branch 'sound/for-next'Stephen Rothwell
Conflicts: sound/soc/sh/fsi.c
2010-12-10Merge remote branch 'crypto/master'Stephen Rothwell
2010-12-10Merge remote branch 'mtd/master'Stephen Rothwell
2010-12-10Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2010-12-10Merge remote branch 'wireless/master'Stephen Rothwell
2010-12-10Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-12-10Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-12-10Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-12-10Merge branch 'quilt/i2c'Stephen Rothwell
2010-12-10Merge remote branch 'hid/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/pci-sysfs.c
2010-12-10Merge remote branch 'nfs/linux-next'Stephen Rothwell
2010-12-10Merge remote branch 'fuse/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'ecryptfs/next'Stephen Rothwell
2010-12-10Merge remote branch 'ceph/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'rmobile/rmobile-latest'Stephen Rothwell
Conflicts: arch/arm/mach-shmobile/Kconfig
2010-12-10Merge remote branch 'powerpc/next'Stephen Rothwell
2010-12-10Merge remote branch 'omap/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'i.MX/for-next'Stephen Rothwell
2010-12-10Merge remote branch 'arm/devel'Stephen Rothwell
2010-12-10Merge remote branch 'sound-current/for-linus'Stephen Rothwell
2010-12-10Merge remote branch 'net-current/master'Stephen Rothwell
2010-12-10Merge branch 'perf/core' into auto-latestIngo Molnar
2010-12-10lockup detector: Compile fixes from removing the old x86 nmi watchdogDon Zickus
My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot. Signed-off-by: Don Zickus <dzickus@redhat.com> Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: fweisbec@gmail.com Cc: yinghai@kernel.org LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-12-09PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()Rafael J. Wysocki
To avoid confusion with the meaning and return value of pm_check_wakeup_events() replace it with pm_wakeup_pending() that will work the other way around (ie. return true when system-wide power transition should be aborted). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2010-12-09PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)Alan Stern
This patch (as1431c) makes the synchronous runtime-PM interface suitable for use in interrupt handlers. Subsystems can call the new pm_runtime_irq_safe() function to tell the PM core that a device's runtime_suspend and runtime_resume callbacks should be invoked with interrupts disabled and the spinlock held. This permits the pm_runtime_get_sync() and the new pm_runtime_put_sync_suspend() routines to be called from within interrupt handlers. When a device is declared irq-safe in this way, the PM core increments the parent's usage count, so the parent will never be runtime suspended. This prevents difficult situations in which an irq-safe device can't resume because it is forced to wait for its non-irq-safe parent. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2010-12-09blibbSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-09sysfs: Introducing binary attributes for struct classStefan Achatz
Added dev_bin_attrs to struct class similar to existing dev_attrs. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-12-09Merge branch 'next' of ↵Dmitry Torokhov
git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next Conflicts: drivers/input/Makefile
2010-12-09Merge branch 'fix/asoc' into for-linusTakashi Iwai
2010-12-09Merge branch 'sched/urgent' into auto-latestIngo Molnar