Linus Torvalds 978ca164bd Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits) amd64_edac: Fix decode_syndrome types amd64_edac: Fix DCT argument type amd64_edac: Fix ranges signedness amd64_edac: Drop local variable amd64_edac: Fix PCI config addressing types amd64_edac: Fix DRAM base macros amd64_edac: Fix node id signedness amd64_edac: Drop redundant declarations amd64_edac: Enable driver on F15h amd64_edac: Adjust ECC symbol size to F15h amd64_edac: Simplify scrubrate setting PCI: Rename CPU PCI id define amd64_edac: Improve DRAM address mapping amd64_edac: Sanitize ->read_dram_ctl_register amd64_edac: Adjust sys_addr to chip select conversion routine to F15h amd64_edac: Beef up early exit reporting amd64_edac: Revamp online spare handling amd64_edac: Fix channel interleave removal amd64_edac: Correct node interleaving removal amd64_edac: Add support for interleaved region swapping ... Fix up trivial conflict in include/linux/pci_ids.h due to AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new AMD_15H_NB_LINK entry.		2011-03-17 17:21:32 -07:00
..
acpi	PM: Remove CONFIG_PM_OPS	2011-03-15 00:43:15 +01:00
asm-generic	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32	2011-03-17 10:11:25 -07:00
crypto
drm	Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next	2011-03-14 14:15:13 +10:00
keys	RxRPC: Fix v1 keys	2011-03-02 22:18:53 -08:00
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-03-17 17:21:32 -07:00
math-emu
media	[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h	2011-01-19 11:52:09 -02:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma
rxrpc
scsi	libsas: convert to libata new error handler	2011-03-02 02:36:45 -05:00
sound	ASoC: WM8903: Fix mic detection register definitions	2011-02-13 19:38:06 +00:00
target	[SCSI] target: Fix t_transport_aborted handling in LUN_RESET + active I/O shutdown	2011-02-28 11:23:32 -06:00
trace	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2011-03-16 17:21:00 -07:00
video	fbdev: sh_mobile_lcdc: Add YUV framebuffer support	2011-03-16 17:27:10 +09:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog	2011-03-17 17:09:29 -07:00
Kbuild