Merge branch 'for-paul-39-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus

2026-11-10 20:48:12 +00:00 · 2011-04-18 17:47:57 +09:00 · 2011-04-18 17:47:57 +09:00 · 9b6d777711
commit 9b6d777711
parent b07f3bbee1 0fd08060f1
94 changed files with 978 additions and 732 deletions
--- a/7
+++ b/7
--- a/2
+++ b/2
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
--- a/drivers/gpio/ml_ioh_gpio.c
+++ b/drivers/gpio/ml_ioh_gpio.c
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
--- a/drivers/gpio/pch_gpio.c
+++ b/drivers/gpio/pch_gpio.c
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
--- a/drivers/net/bna/bfa_ioc.c
+++ b/drivers/net/bna/bfa_ioc.c
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
--- a/drivers/net/mlx4/sense.c
+++ b/drivers/net/mlx4/sense.c
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
--- a/drivers/net/wireless/b43/dma.h
+++ b/drivers/net/wireless/b43/dma.h
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
--- a/drivers/net/wireless/wl12xx/testmode.c
+++ b/drivers/net/wireless/wl12xx/testmode.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
--- a/fs/ext4/ext4_jbd2.h
+++ b/fs/ext4/ext4_jbd2.h
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
--- a/fs/xfs/linux-2.6/xfs_message.c
+++ b/fs/xfs/linux-2.6/xfs_message.c
--- a/fs/xfs/linux-2.6/xfs_message.h
+++ b/fs/xfs/linux-2.6/xfs_message.h
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
--- a/fs/xfs/quota/xfs_qm.h
+++ b/fs/xfs/quota/xfs_qm.h
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
--- a/fs/xfs/xfs_trans_priv.h
+++ b/fs/xfs/xfs_trans_priv.h
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/include/linux/netfilter/ipset/ip_set_ahash.h
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/net/dsa/mv88e6131.c
+++ b/net/dsa/mv88e6131.c
--- a/net/dsa/mv88e6xxx.h
+++ b/net/dsa/mv88e6xxx.h
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
--- a/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
--- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c
--- a/net/netfilter/ipset/ip_set_bitmap_port.c
+++ b/net/netfilter/ipset/ip_set_bitmap_port.c
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
--- a/net/netfilter/xt_TCPMSS.c
+++ b/net/netfilter/xt_TCPMSS.c
--- a/net/netfilter/xt_addrtype.c
+++ b/net/netfilter/xt_addrtype.c
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c