Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-05-24 | Add linux-next specific files for 20110524next-20110524 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2011-05-24 | compat: include aio_abi.h for aio_context_t | Stephen Rothwell | |
fixes this build error on sparc64 (at least): In file included from arch/sparc/include/asm/siginfo.h:19, from include/linux/signal.h:5, from include/linux/sched.h:73, from arch/sparc/kernel/asm-offsets.c:13: include/linux/compat.h:401: error: expected ')' before 'ctx_id' include/linux/compat.h:406: error: expected ')' before 'ctx_id' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2011-05-24 | Revert "PM / Hibernate: Remove arch_prepare_suspend()" | Stephen Rothwell | |
This reverts commit 8f6404f397251d712162db95f811d5febf8749c1. | |||
2011-05-24 | Merge remote-tracking branch 'arm-dt/devicetree/arm-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'cleancache/linux-next' | Stephen Rothwell | |
Conflicts: fs/btrfs/extent_io.c | |||
2011-05-24 | Merge remote-tracking branch 'namespace/master' | Stephen Rothwell | |
Conflicts: arch/alpha/include/asm/unistd.h arch/alpha/kernel/systbls.S arch/m68k/kernel/entry_mm.S arch/sh/include/asm/unistd_32.h arch/sh/include/asm/unistd_64.h arch/sh/kernel/syscalls_32.S arch/sh/kernel/syscalls_64.S | |||
2011-05-24 | Merge remote-tracking branch 'drivers-x86/linux-next' | Stephen Rothwell | |
Conflicts: drivers/platform/x86/Kconfig drivers/platform/x86/Makefile drivers/platform/x86/eeepc-laptop.c drivers/platform/x86/sony-laptop.c | |||
2011-05-24 | Merge remote-tracking branch 'workqueues/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'percpu/for-next' | Stephen Rothwell | |
Conflicts: arch/x86/include/asm/percpu.h | |||
2011-05-24 | Merge remote-tracking branch 'xen-two/linux-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'rcu/rcu/next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'tip/auto-latest' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'spi/spi/next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'devicetree/devicetree/next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'i7300_edac/linux_next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'fsnotify/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'apm/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'suspend/linux-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'watchdog/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'agp/agp-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'selinux/master' | Stephen Rothwell | |
Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c | |||
2011-05-24 | Merge remote-tracking branch 'security-testing/next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'voltage/for-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile | |||
2011-05-24 | Merge remote-tracking branch 'omap_dss2/for-next' | Stephen Rothwell | |
Conflicts: drivers/video/omap2/dss/dsi.c drivers/video/omap2/dss/dss_features.c drivers/video/omap2/dss/dss_features.h | |||
2011-05-24 | Merge remote-tracking branch 'fbdev/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'drm/drm-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'mfd/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'mmc/mmc-next' | Stephen Rothwell | |
Conflicts: drivers/mmc/host/tmio_mmc_pio.c | |||
2011-05-24 | Merge remote-tracking branch 'leds/for-mm' | Stephen Rothwell | |
Conflicts: drivers/leds/Kconfig | |||
2011-05-24 | Merge remote-tracking branch 'battery/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'pcmcia/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'block/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'input/next' | Stephen Rothwell | |
2011-05-24 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'sound/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'bluetooth/master' | Stephen Rothwell | |
Conflicts: net/bluetooth/l2cap_core.c | |||
2011-05-24 | Merge remote-tracking branch 'wireless/master' | Stephen Rothwell | |
Conflicts: drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | |||
2011-05-24 | Merge remote-tracking branch 'dlm/next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'ubi/linux-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'ieee1394/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'cpupowerutils/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'infiniband/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'kconfig/for-next' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'kbuild/for-next' | Stephen Rothwell | |
Conflicts: Makefile | |||
2011-05-24 | Merge remote-tracking branch 'v4l-dvb/master' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'docs/docs-move' | Stephen Rothwell | |
2011-05-24 | Merge branch 'quilt/kernel-doc' | Stephen Rothwell | |
2011-05-24 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2011-05-24 | Merge remote-tracking branch 'bjdooks-i2c/next-i2c' | Stephen Rothwell | |