Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-04-08 | Add linux-next specific files for 20100408next-20100408 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2010-04-08 | Revert "Add non-Virtex5 support for LL TEMAC driver" | Stephen Rothwell | |
This reverts commit 459569145516f7967b916c57445feb02c600668c. | |||
2010-04-08 | Add dequeue for external on BookE | Alexander Graf | |
Commit a0abee86af2d1f048dbe99d2bcc4a2cefe685617 introduced unsetting of the IRQ line from userspace. This added a new core specific callback that I apparently forgot to add for BookE. So let's add the callback for BookE as well, making it build again. Signed-off-by: Alexander Graf <agraf@suse.de> | |||
2010-04-08 | Merge branch 'quilt/usb' | Stephen Rothwell | |
2010-04-08 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/base/platform.c | |||
2010-04-08 | Merge remote branch 'workqueues/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'limits/writable_limits' | Stephen Rothwell | |
Conflicts: arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S | |||
2010-04-08 | Merge remote branch 'devicetree/next-devicetree' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/Kbuild lib/Kconfig | |||
2010-04-08 | Merge remote branch 'drbd/for-jens' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'irda/for-next' | Stephen Rothwell | |
Conflicts: drivers/net/irda/irda-usb.c | |||
2010-04-08 | Merge remote branch 'fsnotify/for-next' | Stephen Rothwell | |
Conflicts: fs/notify/inotify/inotify_user.c include/linux/fsnotify.h kernel/audit_tree.c kernel/audit_watch.c kernel/sysctl.c | |||
2010-04-08 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2010-04-08 | Merge branch 'quilt/aoe' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'uwb/for-upstream' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'agp/agp-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'security-testing/next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/radeon/r300.c | |||
2010-04-08 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/dma/timb_dma.c | |||
2010-04-08 | Merge remote branch 'md/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'slab/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'battery/master' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'pcmcia/master' | Stephen Rothwell | |
Conflicts: drivers/net/pcmcia/3c589_cs.c drivers/pcmcia/pcmcia_resource.c | |||
2010-04-08 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'input/next' | Stephen Rothwell | |
Conflicts: drivers/char/sysrq.c | |||
2010-04-08 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c | |||
2010-04-08 | Merge remote branch 'cpufreq/next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
Conflicts: sound/soc/codecs/ad1938.c | |||
2010-04-08 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'wireless/master' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-tx.c | |||
2010-04-08 | Merge remote branch 'net/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/mac80211/scan.c | |||
2010-04-08 | Merge remote branch 'async_tx/next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'ibft/master' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'kvm/linux-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'acpi/test' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'infiniband/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'libata/NEXT' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'kconfig/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'kbuild/for-next' | Stephen Rothwell | |
2010-04-08 | Merge remote branch 'v4l-dvb/master' | Stephen Rothwell | |
Conflicts: drivers/media/video/meye.c drivers/media/video/soc_camera.c drivers/staging/cx25821/cx25821-audio-upstream.c | |||
2010-04-08 | Merge branch 'quilt/kernel-doc' | Stephen Rothwell | |
2010-04-08 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |