Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-04-12 | Add linux-next specific files for 20110412next-20110412 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2011-04-12 | sched: fix sparc64 for sched_domain changes | Stephen Rothwell | |
Fixes this compile error: kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function) Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2011-04-12 | Merge remote-tracking branch 'cleancache/linux-next' | Stephen Rothwell | |
Conflicts: fs/ocfs2/super.c fs/super.c include/linux/fs.h mm/Kconfig mm/truncate.c | |||
2011-04-12 | Merge remote-tracking branch 'staging/staging-next' | Stephen Rothwell | |
Conflicts: drivers/staging/ath6kl/os/linux/ar6000_android.c drivers/staging/brcm80211/README drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c drivers/staging/gma500/psb_drm.h drivers/staging/gma500/psb_ttm_fence_user.h drivers/staging/hv/hv_util.c drivers/staging/hv/vmbus_drv.c | |||
2011-04-12 | Merge remote-tracking branch 'drivers-x86/linux-next' | Stephen Rothwell | |
Conflicts: drivers/platform/x86/intel_mid_thermal.c | |||
2011-04-12 | Merge remote-tracking branch 'workqueues/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'percpu/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'xen-two/linux-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'ptrace/ptrace' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'oprofile/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'rcu/rcu/next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'tip/auto-latest' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/process.c | |||
2011-04-12 | Merge remote-tracking branch 'spi/spi/next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'i7300_edac/linux_next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'fsnotify/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'suspend/linux-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'trivial/for-next' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/ath/ath9k/phy.h | |||
2011-04-12 | Merge remote-tracking branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'watchdog/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'agp/agp-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'selinux/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'security-testing/next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'voltage/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'omap_dss2/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'mfd/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'mmc/mmc-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'leds/for-mm' | Stephen Rothwell | |
Conflicts: drivers/leds/Kconfig | |||
2011-04-12 | Merge remote-tracking branch 'block/for-next' | Stephen Rothwell | |
2011-04-12 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2011-04-12 | Merge commit 'refs/next/20110411/sound-asoc' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'sound/for-next' | Stephen Rothwell | |
Conflicts: sound/soc/codecs/wm8994.c | |||
2011-04-12 | Merge remote-tracking branch 'crypto/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'bluetooth/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'wireless/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | |||
2011-04-12 | Merge remote-tracking branch 'net/master' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'dlm/next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'kvm/linux-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'ubi/linux-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'ieee1394/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'cpupowerutils/cpupowerutils' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'idle-test/idle-test' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'acpi/test' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'infiniband/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'kconfig/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'kbuild/for-next' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'v4l-dvb/master' | Stephen Rothwell | |
Conflicts: arch/arm/mach-omap2/devices.c drivers/media/dvb/frontends/drx397xD.c drivers/staging/Kconfig drivers/staging/easycap/easycap_ioctl.c | |||
2011-04-12 | Merge remote-tracking branch 'hwmon-staging/hwmon-next' | Stephen Rothwell | |
2011-04-12 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2011-04-12 | Merge remote-tracking branch 'bjdooks-i2c/next-i2c' | Stephen Rothwell | |
Conflicts: arch/arm/mach-pxa/tosa.c drivers/i2c/busses/i2c-designware-core.c drivers/i2c/busses/i2c-intel-mid.c drivers/i2c/busses/i2c-pxa.c |