summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-08-016-211/+88
|\
| * um: fix ubd_file_size for read-only filesMartin Pärtel2012-08-021-1/+1
| * um: remove count_lockRichard Weinberger2012-07-282-7/+0
| * um: fully use tty_portRichard Weinberger2012-07-284-78/+65
| * um: Remove dead codeRichard Weinberger2012-07-281-26/+0
| * um: remove line_ioctl()Richard Weinberger2012-07-284-90/+0
| * TTY: um/line, use tty from tty_portJiri Slaby2012-07-283-9/+21
| * TTY: um/line, add tty_portJiri Slaby2012-07-282-4/+5
* | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-315-17/+11
|\ \
| * | um: remove IRQF_SAMPLE_RANDOM which is now a no-opTheodore Ts'o2012-07-195-17/+11
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-191-1/+0
|\ \ \ | | |/ | |/|
| * | Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"Paul E. McKenney2012-07-021-1/+0
| |/
* | arch: Use eth_random_addrJoe Perches2012-07-161-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlLinus Torvalds2012-05-235-9/+10
|\
| * um: Implement um_free_irq()Richard Weinberger2012-05-215-9/+10
* | rcu: Move PREEMPT_RCU preemption to switch_to() invocationPaul E. McKenney2012-05-021-0/+1
|/
* um: Disintegrate asm/system.hRichard Weinberger2012-04-101-0/+1
* um: switch cow_user.h to htobe{32,64}/betoh{32,64}Al Viro2012-04-102-57/+21
* Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-2715-366/+292
|\
| * um: deadlock in line_write_interrupt()Al Viro2012-03-251-0/+1
| * um: switch close_chan() to struct lineAl Viro2012-03-253-9/+11
| * um: race fix: initialize delayed_work *before* registering IRQAl Viro2012-03-253-18/+15
| * um: line->have_irq is never checked...Al Viro2012-03-252-2/+0
| * um: chan_init_pri is dead nowAl Viro2012-03-251-2/+0
| * um: switch users of ->chan_list to ->chan_{in,out} (easy cases)Al Viro2012-03-255-128/+88
| * um: sorting out the chan mess, part 1Al Viro2012-03-252-0/+5
| * um: finally kill ->init_str leaksAl Viro2012-03-251-1/+3
| * um: get rid of lines_init()Al Viro2012-03-254-46/+33
| * um: switch line.c tty drivers to dynamic device creationAl Viro2012-03-254-42/+40
| * um: fix races between line_open() and line_config()Al Viro2012-03-252-28/+29
| * um: convert count_lock to mutex, fix a race in line_open()Al Viro2012-03-254-20/+12
| * um: get rid of the init_prio messAl Viro2012-03-254-74/+68
| * um: switch line_config() to setup_one_line()Al Viro2012-03-251-6/+16
| * um: switch line_remove() to setup_one_line()Al Viro2012-03-251-8/+5
| * um: clean up the includes in ubdAl Viro2012-03-253-34/+18
| * um: irq: Remove IRQF_DISABLEDYong Zhang2012-03-257-11/+11
* | UML net: set addr_assign_type if random_ether_addr() usedDanny Kukawka2012-02-171-3/+8
|/
* Merge branch 'for-linus' of git://github.com/richardweinberger/linuxLinus Torvalds2011-11-0228-46/+422
|\
| * um: fix ubd cow sizeRichard Weinberger2011-11-021-1/+30
| * um: kill useless argument of free_chan() and free_one_chan()Al Viro2011-11-021-5/+5
| * um: take ubd_user.h to its users...Al Viro2011-11-021-0/+16
| * um: take mconsole*.h to arch/um/driversAl Viro2011-11-022-0/+150
| * um: take chan_*.h and line.h to arch/um/driversAl Viro2011-11-027-6/+215
| * um: take register_winch_irq() into the caller of is_skas_winch()Al Viro2011-11-021-1/+6
| * um: kill shared/mem_kern.hAl Viro2011-11-021-1/+0
| * um: don't include kern.h unless it's neededAl Viro2011-11-022-2/+0
| * um: -include user.h for USER_OBJ, trim includesAl Viro2011-11-0217-30/+0
* | Merge branch 'master' of github.com:davem330/netDavid S. Miller2011-09-222-25/+37
|\ \ | |/
| * um: fix free_winch() messAl Viro2011-09-141-14/+24
| * um: winch_interrupt() can happen inside of free_winch()Al Viro2011-09-141-2/+4
OpenPOWER on IntegriCloud