summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/gconf.glade
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 20:11:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-16 20:11:53 +0200
commitb5dbc858717113c823fe6bb058807c2cb67d1efa (patch)
treee82858156bf5d46b539455728ac1b8a7cd9feb02 /scripts/kconfig/gconf.glade
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentrtnetlink: make SR-IOV VF interface symmetric (diff)
downloadlinux-b5dbc858717113c823fe6bb058807c2cb67d1efa.tar.xz
linux-b5dbc858717113c823fe6bb058807c2cb67d1efa.zip
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: rtnetlink: make SR-IOV VF interface symmetric sctp: delete active ICMP proto unreachable timer when free transport tcp: fix MD5 (RFC2385) support
Diffstat (limited to 'scripts/kconfig/gconf.glade')
0 files changed, 0 insertions, 0 deletions