Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Showing
- Documentation/DocBook/mcabook.tmpl 1 addition, 1 deletionDocumentation/DocBook/mcabook.tmpl
- drivers/net/wan/syncppp.c 1 addition, 0 deletionsdrivers/net/wan/syncppp.c
- drivers/scsi/libata-core.c 2 additions, 2 deletionsdrivers/scsi/libata-core.c
- include/sound/pcm.h 1 addition, 1 deletioninclude/sound/pcm.h
- kernel/sched.c 1 addition, 0 deletionskernel/sched.c
Loading
Please register or sign in to comment