#
c64eae9a |
| 04-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.38-rc3' into devicetree/next
|
#
949c3676 |
| 02-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: Merge branch 'staging-next' into 2.6.38-rc3
This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211
Staging: Merge branch 'staging-next' into 2.6.38-rc3
This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
8104a477 |
| 02-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
17292ecc |
| 01-Feb-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/urgent' into sh-latest
|
#
a1f3d4bb |
| 01-Feb-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.38-rc3' into next
|
Revision tags: v2.6.38-rc3 |
|
#
cc09b5f6 |
| 31-Jan-2011 |
Chuck Ebbert <cebbert@redhat.com> |
CAN: softing driver depends on IOMEM
Without this dependency the softing driver will be buildable on s390, where it fails.
Signed-Off-By: Chuck Ebbert <cebbert@redhat.com> Acked-by: Kurt Van Dijck
CAN: softing driver depends on IOMEM
Without this dependency the softing driver will be buildable on s390, where it fails.
Signed-Off-By: Chuck Ebbert <cebbert@redhat.com> Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
58b8a5b4 |
| 31-Jan-2011 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
72056497 |
| 27-Jan-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (43 commits) bnx2: Eliminate AER error messages on systems not supp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (43 commits) bnx2: Eliminate AER error messages on systems not supporting it cnic: Fix big endian bug xfrm6: Don't forget to propagate peer into ipsec route. tg3: Use new VLAN code bonding: update documentation - alternate configuration. TCP: fix a bug that triggers large number of TCP RST by mistake MAINTAINERS: remove Reinette Chatre as iwlwifi maintainer rt2x00: add device id for windy31 usb device mac80211: fix a crash in ieee80211_beacon_get_tim on change_interface ipv6: Revert 'administrative down' address handling changes. textsearch: doc - fix spelling in lib/textsearch.c. USB NET KL5KUSB101: Fix mem leak in error path of kaweth_download_firmware() pch_gbe: don't use flush_scheduled_work() bnx2: Always set ETH_FLAG_TXVLAN net: clear heap allocation for ethtool_get_regs() ipv6: Always clone offlink routes. dcbnl: make get_app handling symmetric for IEEE and CEE DCBx tcp: fix bug in listening_get_next() inetpeer: Use correct AVL tree base pointer in inet_getpeer(). GRO: fix merging a paged skb after non-paged skbs ...
show more ...
|
#
5bdc22a5 |
| 24-Jan-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/sched/sch_hfsc.c net/sched/sch_htb.c net/sched/sch_tbf.c
|
Revision tags: v2.6.38-rc2, v2.6.38-rc1 |
|
#
0a0b7a5f |
| 11-Jan-2011 |
Kurt Van Dijck <kurt.van.dijck@eia.be> |
can: add driver for Softing card
This patch adds the driver that creates a platform:softing device from a pcmcia_device Note: the Kconfig indicates a dependency on the softing.ko driver, but this is
can: add driver for Softing card
This patch adds the driver that creates a platform:softing device from a pcmcia_device Note: the Kconfig indicates a dependency on the softing.ko driver, but this is purely to make configuration intuitive. This driver will work independent, but no CAN network devices appear until softing.ko is loaded too.
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
03fd3cf5 |
| 11-Jan-2011 |
Kurt Van Dijck <kurt.van.dijck@eia.be> |
can: add driver for Softing card
This patch adds a driver for the platform:softing device. This will create (up to) 2 CAN network devices from 1 platform:softing device
Signed-off-by: Kurt Van Dijc
can: add driver for Softing card
This patch adds a driver for the platform:softing device. This will create (up to) 2 CAN network devices from 1 platform:softing device
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|