summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2007-12-10 22:05:56 +0100
committerTobias Klauser <tklauser@xenon.tklauser.home>2007-12-10 22:05:56 +0100
commitdb6eaaa0269b7e0b98161ed97216c2d3986d1ceb (patch)
tree8f9ae010616f09b2bad52b0bd431653ba499de80 /README
parent6bb13dc36d2ce783dfb4a157983d8fbb7baa3755 (diff)
cscope 15.6-515.6-5
* Remove left over Emacs startup file (Closes: #454377) * Update to Standards-Version 3.7.3 (no changes needed)
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions
nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/drm/drm_gem.h')